1 files changed, 0 insertions, 3 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample66.xsd b/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample66.xsd
deleted file mode 100644
index 2787781ed..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample66.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.sample.org/66" xmlns:tns="http://www.sample.org/66">
-<import namespace="http://www.sample.org/44" schemaLocation="sample44.xsd"/><import namespace="http://www.sample.org/51" schemaLocation="./sample51.xsd"/><import namespace="http://www.sample.org/59" schemaLocation=".\sample59.xsd"/><complexType name="NewComplexType"><sequence><element name="NewElement" type="string"></element><element name="NewElement1" type="string"></element></sequence></complexType><element name="NewGlobalElement" type="tns:NewComplexType"></element></schema>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore
deleted file mode 100644
index dda1b8f60..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.enterprise_ui.feature.patch_*.jar
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/.project b/features/org.eclipse.jst.enterprise_ui.feature.patch/.project
deleted file mode 100644
index 02a716add..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.enterprise_ui.feature.patch R3_0_1_patches</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.jst.enterprise_ui.feature.patch/build.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/build.properties
deleted file mode 100644
index cb50260a9..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
deleted file mode 100644
index a7f27097d..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
+++ /dev/null
@@ -1,40 +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.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 3.0.5 Patches</h1>
-
-<p>Bug <a href='https://bugs.eclipse.org/276538'>276538</a>. Ant console output seems to imply that parameter can be set but really it should not be</p>
-<p>Bug <a href='https://bugs.eclipse.org/283312'>283312</a>. ANT Client gen- message missing server name subst. variable</p>
-<p>Bug <a href='https://bugs.eclipse.org/283399'>283399</a>. Web Services > Server & Runtime preference undefined</p>
-<p>Bug <a href='https://bugs.eclipse.org/286859'>286859</a>. EJB Projects created by web Service Wizards does not add the ejbModule as a source folder</p>
-<p>Bug <a href='https://bugs.eclipse.org/285933'>285933</a>. SOAPElementSaxHandler to create text nodes results in null return for char size 1</p>
-<p>Bug <a href='https://bugs.eclipse.org/291075'>291075</a>. remove auto build join calls</p>
-<p>Bug <a href="https://bugs.eclipse.org/291143">291143</a>. Mechanism to expose WEB-INF/lib classpath component dependencies</p>
-<p>Bug <a href='https://bugs.eclipse.org/291225'>291225</a>. Output folder support in JavaEE projects</p>
-<p>Bug <a href='https://bugs.eclipse.org/292571'>292571</a>. JavaEE EMF content provider improperly synchronizing during notification</p>
-<p>Bug <a href='https://bugs.eclipse.org/293497'>293497</a>. Utility jars removed from the properties</p>
-<p>Bug <a href='https://bugs.eclipse.org/299059'>299059</a>. Check for Main-Class in MANIFEST.MF should not always occur</p>
-<p>Bug <a href='https://bugs.eclipse.org/299432'>299432</a>. J2EE Deployment framework doesn't allow facet exclusions</p>
-<p>Bug <a href='https://bugs.eclipse.org/299764'>299764</a>. Exception from JEE5ContentProvider</p>
-<p>Bug <a href='https://bugs.eclipse.org/300098'>300098</a>. 'In Lib Dir' checkbox being ignored when a jar dependency is added to an EAR</p>
-<p>Bug <a href='https://bugs.eclipse.org/302009'>302009</a>. ClassCastException when org.eclipse.wst.ws.ifile2uriconverter plugged in</p>
-<p>Bug <a href='https://bugs.eclipse.org/304385'>304385</a>. Allow users to disable copying axis jars</p>
-<p>Bug <a href='https://bugs.eclipse.org/319311'>319311</a>. Jars exported as variable names instead of jar names</p>
-<p>Bug <a href='https://bugs.eclipse.org/320134'>320134</a>. Java facet version changes</p>
-<p>Bug <a href='https://bugs.eclipse.org/320436'>320436</a>. jar's placed in Java EE 5 Ear's lib directory should never be considered "modules"</p>
-<p>Bug <a href='https://bugs.eclipse.org/320536'>320536</a>. User defined location path for new Ear modules not being used used.</p>
-<p>Bug <a href='https://bugs.eclipse.org/321655'>321655</a>. Zip file references added to EAR are exported with extension .zip.jar</p>
-<p>Bug <a href='https://bugs.eclipse.org/321884'>321884</a>. Backport 289113: Linux: usability issue when selecting a Java Project in the Specify Client Project Settings dialog</p>
-<p>Bug <a href='https://bugs.eclipse.org/322436'>322436</a>. AddModulestoEARPropertiesPage.updateLibDir() method should call getModelObject() method from inside modify block</p>
-<p>Bug <a href='https://bugs.eclipse.org/322938'>322938</a>. Internal component path info bleeding through EAR J2EE Module Dependencies properties page</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
deleted file mode 100644
index 4b826a8bb..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,172 +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 Patches for org.eclipse.jst.enterprise_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=\n\
-\n\
-The fixes are described in the following bugzilla entries:\n\
-\n\
-Bug https://bugs.eclipse.org/276538 Ant console output seems to imply that parameter can be set but really it should not be\n\
-Bug https://bugs.eclipse.org/283312 ANT Client gen- message missing server name subst. variable\n\
-Bug https://bugs.eclipse.org/283399 Web Services > Server & Runtime preference undefined\n\
-Bug https://bugs.eclipse.org/286859 EJB Projects created by web Service Wizards does not add the ejbModule as a source folder\n\
-Bug https://bugs.eclipse.org/285933 SOAPElementSaxHandler to create text nodes results in null return for char size 1\n\
-Bug https://bugs.eclipse.org/291075 remove auto build join calls\n\
-Bug https://bugs.eclipse.org/291143 Mechanism to expose WEB-INF/lib classpath component dependencies\n\
-Bug https://bugs.eclipse.org/291225 Output folder support in JavaEE projects\n\
-Bug https://bugs.eclipse.org/292571 JavaEE EMF content provider improperly synchronizing during notification\n\
-Bug https://bugs.eclipse.org/293497 Utility jars removed from the properties\n\
-Bug https://bugs.eclipse.org/299059 Check for Main-Class in MANIFEST.MF should not always occur\n\
-Bug https://bugs.eclipse.org/299432 J2EE Deployment framework doesn't allow facet exclusions\n\
-Bug https://bugs.eclipse.org/299764 Exception from JEE5ContentProvider\n\
-Bug https://bugs.eclipse.org/300098 'In Lib Dir' checkbox being ignored when a jar dependency is added to an EAR\n\
-Bug https://bugs.eclipse.org/302009 ClassCastException when org.eclipse.wst.ws.ifile2uriconverter plugged in\n\
-Bug https://bugs.eclipse.org/304385 Allow users to disable copying axis jars\n\
-Bug https://bugs.eclipse.org/319311 Jars exported as variable names instead of jar names\n\
-Bug https://bugs.eclipse.org/320134 Java facet version changes\n\
-Bug https://bugs.eclipse.org/320436 jar's placed in Java EE 5 Ear's lib directory should never be considered "modules"\n\
-Bug https://bugs.eclipse.org/320536 User defined location path for new Ear modules not being used used.\n\
-Bug https://bugs.eclipse.org/321655 Zip file references added to EAR are exported with extension .zip.jar\n\
-Bug https://bugs.eclipse.org/321884 Backport 289113: Linux: usability issue when selecting a Java Project in the Specify Client Project Settings dialog\n\
-Bug https://bugs.eclipse.org/322436 AddModulestoEARPropertiesPage.updateLibDir() method should call getModelObject() method from inside modify block\n\
-Bug https://bugs.eclipse.org/322938 Internal component path info bleeding through EAR J2EE Module Dependencies properties page\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\
-August, 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.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
deleted file mode 100644
index 6fd4b1f90..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature.patch"
-      label="%featureName"
-      version="3.0.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.0.5.v200904070030-7Y7BFTBEPOwQQhP9-_UXFxRBQvWw" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.ws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.axis.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.jca.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.navigator.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.servlet.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.creation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.consumption"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jst.ejb.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/license.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.enterprise_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.jst.web_core.feature.patch/.cvsignore b/features/org.eclipse.jst.web_core.feature.patch/.cvsignore
deleted file mode 100644
index b1d6d303a..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-feature.temp.folder
diff --git a/features/org.eclipse.jst.web_core.feature.patch/.project b/features/org.eclipse.jst.web_core.feature.patch/.project
deleted file mode 100644
index 6edda4614..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.web_core.feature.patch-hold</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.jst.web_core.feature.patch/build.properties b/features/org.eclipse.jst.web_core.feature.patch/build.properties
deleted file mode 100644
index cb50260a9..000000000
--- a/features/org.eclipse.jst.web_core.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.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
deleted file mode 100644
index da28a9623..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Build" content="Build">
-<title>Web Tools Platform Patch Build Notes</title>
-</head>
-
-<body>
-
-<h1>WTP 3.0.5 Patches</h1>
-
-<p>Bug <a href='https://bugs.eclipse.org/272389'>272389</a>. tokenizers stuck in loop when input not matched</p>
-<p>Bug <a href='https://bugs.eclipse.org/278131'>278131</a>. StackOverflow thrown in JDOMSearchHelper.findInnerJavaElement</p>
-<p>Bug <a href='https://bugs.eclipse.org/279038'>279038</a>. JSP opens dirty if content type header misspells "charset"</p>
-<p>Bug <a href='https://bugs.eclipse.org/279175'>279175</a>. An internal error occurred during: "Validation TestEJB".</p>
-<p>Bug <a href='https://bugs.eclipse.org/281147'>281147</a>. problem adding ee5 libs to container</p>
-<p>Bug <a href='https://bugs.eclipse.org/281562'>281562</a>. Unsafe JDT calls in classpath container code</p>
-<p>Bug <a href='https://bugs.eclipse.org/283176'>283176</a>. NPE in EARArtifactEdit.getModuleByManifestURI(String uri)</p>
-<p>Bug <a href='https://bugs.eclipse.org/283209'>283209</a>. !MESSAGE Exception while reading /EAR5Client/.classpath</p>
-<p>Bug <a href='https://bugs.eclipse.org/283318'>283318</a>. Single root check failing when source folder mapped but deleted</p>
-<p>Bug <a href='https://bugs.eclipse.org/283580'>283580</a>. EAR 5.0 libs performance and missing updates</p>
-<p>Bug <a href='https://bugs.eclipse.org/283601'>283601</a>. For Web Project verify source folders and web content do not collide</p>
-<p>Bug <a href='https://bugs.eclipse.org/283632'>283632</a>. EJb ref validation in EAR validator need to throw error message</p>
-<p>Bug <a href='https://bugs.eclipse.org/284302'>284302</a>. Memory leaks in IArchive classes</p>
-<p>Bug <a href='https://bugs.eclipse.org/284327'>284327</a>. Memory leaks because of final static constants</p>
-<p>Bug <a href='https://bugs.eclipse.org/284932'>284932</a>. TaglibIndex optimization ignores important resource change events</p>
-<p>Bug <a href='https://bugs.eclipse.org/285087'>285087</a>. JSP Translator does not support IterationTag constructs</p>
-<p>Bug <a href='https://bugs.eclipse.org/286937'>286937</a>. ExceptionInInitializerError from TaglibHelper.isIterationTag in log</p>
-<p>Bug <a href='https://bugs.eclipse.org/286969'>286969</a>. Java string constants containing entity references get decoded</p>
-<p>Bug <a href='https://bugs.eclipse.org/287742'>287742</a>. EAR import showing ejb client jars on second page when it should not</p>
-<p>Bug <a href='https://bugs.eclipse.org/287749'>287749</a>. Core exceptions during EAR import</p>
-<p>Bug <a href='https://bugs.eclipse.org/288184'>288184</a>. Ear import fails if two EJB modules use same client jar</p>
-<p>Bug <a href='https://bugs.eclipse.org/288832'>288832</a>. IArchive performance problems with large amount of files within single archive</p>
-<p>Bug <a href='https://bugs.eclipse.org/289203'>289203</a>. Facet classpath utility not properly migrating legacy projects</p>
-<p>Bug <a href='https://bugs.eclipse.org/288290'>288290</a>. NPEs in TLDCMDocumentManager</p>
-<p>Bug <a href='https://bugs.eclipse.org/289257'>289257</a>. [translation] JSPTranslator should handle assignment in JSP expressions</p>
-<p>Bug <a href='https://bugs.eclipse.org/290832'>290832</a>. Backport the fix for bugzilla#260931 to wtp 3.0.5</p>
-<p>Bug <a href='https://bugs.eclipse.org/290738'>290738</a>. False errors/warnings when validating expressions with maps</p>
-<p>Bug <a href='https://bugs.eclipse.org/290543'>290543</a>. Backport the fix for bugilla#282936 to wtp 3.0.5</p>
-<p>Bug <a href='https://bugs.eclipse.org/290412'>290412</a>. Performance problem in method TypeUtil.resolveInParents()</p>
-<p>Bug <a href='https://bugs.eclipse.org/290581'>290581</a>. Manual validation is cleaning up the already validated cache on every call</p>
-<p>Bug <a href='https://bugs.eclipse.org/290742'>290742</a>. EAR Export not properly closing 1.4 archives</p>
-<p>Bug <a href='https://bugs.eclipse.org/290757'>290757</a>. 'Prepare for Deployment' error message states "J2EEDeployOperation_2_UI_"</p>
-<p>Bug <a href='https://bugs.eclipse.org/290837'>290837</a>. Exceptions from JEM in adopter product</p>
-<p>Bug <a href="https://bugs.eclipse.org/290966">290966</a>. JSP include directives do not handle non-JSP content types</p>
-<p>Bug <a href="https://bugs.eclipse.org/291143">291143</a>. Mechanism to expose WEB-INF/lib classpath component dependencies</p>
-<p>Bug <a href='https://bugs.eclipse.org/291225'>291225</a>. Output folder support in JavaEE projects</p>
-<p>Bug <a href='https://bugs.eclipse.org/291251'>291251</a>. API needed to determine if project has no single root and reasons why</p>
-<p>Bug <a href='https://bugs.eclipse.org/291266'>291266</a>. Deleting java source folders should remove the corresponding artifacts from the .settings/org.eclipse.wst.common.component file</p>
-<p>Bug <a href='https://bugs.eclipse.org/291536'>291536</a>. Session Bean remote interface validation should be error for missing methods</p>
-<p>Bug <a href='https://bugs.eclipse.org/249044'>249044</a>. Web module's jar modules from another project are not published for Tomcat.</p>
-<p>Bug <a href='https://bugs.eclipse.org/272013'>272013</a>. JEM JemProjectUtilities#getClasspathAsURLArray(IJavaProject) fails to handle class folders</p>
-<p>Bug <a href='https://bugs.eclipse.org/290739'>290739</a>. Don't validate the expression segments after the map if the map value type is Object</p>
-<p>Bug <a href='https://bugs.eclipse.org/292079'>292079</a>. [parser] Scriptlet in <script> attribute tags can cause the region to not be block text</p>
-<p>Bug <a href='https://bugs.eclipse.org/292081'>292081</a>. [translation] Javascript can cause custom tags to not be translated</p>
-<p>Bug <a href='https://bugs.eclipse.org/292162'>292162</a>. isSingleRoot API should allow non Java src folder as output for JCA</p>
-<p>Bug <a href='https://bugs.eclipse.org/292177'>292177</a>. [validation] JSPDirectiveValidator#processTaglibDirective should handle URL Taglib Records</p>
-<p>Bug <a href='https://bugs.eclipse.org/292186'>292186</a>. WebLib Quick fixes reverting exclusions</p>
-<p>Bug <a href='https://bugs.eclipse.org/293047'>293047</a>. Problem with WTPWorkingCopyManager and deleting projects</p>
-<p>Bug <a href='https://bugs.eclipse.org/293502'>293502</a>. Performance degradation because of JavaLite calls</p>
-<p>Bug <a href='https://bugs.eclipse.org/293685'>293685</a>. JAX-RPC client JSPs: JSPG0036E: Failed to find resource /sampleEchoProxy/TestClient.jsp</p>
-<p>Bug <a href='https://bugs.eclipse.org/293992'>293992</a>. [validation] JSPBatchValidator is taking substantially longer when needed taglibs are not on class path</p>
-<p>Bug <a href='https://bugs.eclipse.org/293981'>293981</a>. [validation] Attributes do not indicate problems with dynamic content in rtexprvalue attributes</p>
-<p>Bug <a href='https://bugs.eclipse.org/294369'>294369</a>. EAR 5.0 Lib utility deployment</p>
-<p>Bug <a href='https://bugs.eclipse.org/294490'>294490</a>. EAR Libraries container miscomputing because of stale IJavaLite</p>
-<p>Bug <a href='https://bugs.eclipse.org/293211'>293211</a>. Performance problem when validate managed properties</p>
-<p>Bug <a href='https://bugs.eclipse.org/294627'>294627</a>. Deleting folders should remove entry from .settings/org.eclipse.wst.common.component file</p>
-<p>Bug <a href='https://bugs.eclipse.org/295353'>295353</a>. Adding module to application.xml no longer generating "id" attributes</p>
-<p>Bug <a href='https://bugs.eclipse.org/294716'>294716</a>. ClasspathDecorationsManager may cause SAXParseException</p>
-<p>Bug <a href='https://bugs.eclipse.org/295617'>295617</a>. Web project creation does not honour user input</p>
-<p>Bug <a href='https://bugs.eclipse.org/295728'>295728</a>. Deferred EL expressions are being marked with validation problems</p>
-<p>Bug <a href='https://bugs.eclipse.org/296719'>296719</a>. Runtime Change Delegate throws NPE when changing from Unknown Runtime type</p>
-<p>Bug <a href='https://bugs.eclipse.org/298796'>298796</a>. isSingleRoot API should not require a Java src folder</p>
-<p>Bug <a href='https://bugs.eclipse.org/293504'>293504</a>. [validation] JSP syntax validator requires brackets after IF statement</p>
-<p>Bug <a href='https://bugs.eclipse.org/297852'>297852</a>. Error log entry for ArrayIndexOutOfBoundsException related to Annotations and EMF</p>
-<p>Bug <a href='https://bugs.eclipse.org/298891'>298891</a>. Classpath initialization is very slow for complex EARs</p>
-<p>Bug <a href='https://bugs.eclipse.org/299156'>299156</a>. [parser] JSPTokenizer does not detect Unicode character references as you type</p>
-<p>Bug <a href='https://bugs.eclipse.org/299393'>299393</a>. Validation of runtime expressions in JSP custom tag attributes</p>
-<p>Bug <a href='https://bugs.eclipse.org/299432'>299432</a>. J2EE Deployment framework doesn't allow facet exclusions</p>
-<p>Bug <a href='https://bugs.eclipse.org/299437'>299437</a>. NPEs logged due to bug 295353</p>
-<p>Bug <a href='https://bugs.eclipse.org/299488'>299488</a>. [translation] XMLJSPRegionHelper#decodeRemainingRegions can cause NPE</p>
-<p>Bug <a href='https://bugs.eclipse.org/299489'>299489</a>. [content model] CMDocumentFactoryTLD#getContainedText can cause NPE</p>
-<p>Bug <a href='https://bugs.eclipse.org/299541'>299541</a>. Excessive logging in TaglibClassLoader</p>
-<p>Bug <a href='https://bugs.eclipse.org/299655'>299655</a>. ClasspathSelection needs better error handling</p>
-<p>Bug <a href='https://bugs.eclipse.org/299785'>299785</a>. HTML causes validation errors in Tag files</p>
-<p>Bug <a href='https://bugs.eclipse.org/300062'>300062</a>. Performance improvement of VirtualComponent caching</p>
-<p>Bug <a href='https://bugs.eclipse.org/300098'>300098</a>. 'In Lib Dir' checkbox being ignored when a jar dependency is added to an EAR</p>
-<p>Bug <a href='https://bugs.eclipse.org/300183'>300183</a>. Componentcore.createComponent returns a null value when called from adopter product</p>
-<p>Bug <a href='https://bugs.eclipse.org/300387'>300387</a>. Need to protect against NPE in adopter J2EEElementChangedListener</p>
-<p>Bug <a href='https://bugs.eclipse.org/301419'>301419</a>. IllegalException thrown during deployment</p>
-<p>Bug <a href='https://bugs.eclipse.org/301477'>301477</a>. EAR Libraries container missing entries on restart</p>
-<p>Bug <a href='https://bugs.eclipse.org/301540'>301540</a>. Incorrect reporting of JSP problems</p>
-<p>Bug <a href='https://bugs.eclipse.org/301598'>301598</a>. [translation] Cannot be resolved errors when Struts <bean:define> is defined within <input type> HTML tag</p>
-<p>Bug <a href='https://bugs.eclipse.org/303070'>303070</a>. random build/compile error due to out of sync deployment descriptor</p>
-<p>Bug <a href='https://bugs.eclipse.org/303140'>303140</a>. ComponentArchiveSaveAdapter incorrectly handles .settings files</p>
-<p>Bug <a href='https://bugs.eclipse.org/303131'>303131</a>. J2EEComponentClasspathContainer.getEARLibDir should check both DD and facet version</p>
-<p>Bug <a href='https://bugs.eclipse.org/303963'>303963</a>. Error Exception logged during deploy</p>
-<p>Bug <a href='https://bugs.eclipse.org/305252'>305252</a>. ClassCastException:j2ee.application.internal.impl.ApplicationImpl incompatible with javaee.application.Application</p>
-<p>Bug <a href='https://bugs.eclipse.org/305253'>305253</a>. Performance issue in Manual EAR validation</p>
-<p>Bug <a href='https://bugs.eclipse.org/306058'>306058</a>. NoClassDefFoundError coming from the TaglibHelper</p>
-<p>Bug <a href='https://bugs.eclipse.org/313181'>313181</a>. Java EE import fails if zip entries contain leading slashes</p>
-<p>Bug <a href='https://bugs.eclipse.org/313399'>313399</a>. Opener of Archive didn't close a file</p>
-<p>Bug <a href='https://bugs.eclipse.org/313608'>313608</a>. random build/compile error due to out of sync files</p>
-<p>Bug <a href='https://bugs.eclipse.org/313630'>313630</a>. V1 Validator extension point changes for performance</p>
-<p>Bug <a href='https://bugs.eclipse.org/316222'>316222</a>. [parser] < or > in attribute values are not supported</p>
-<p>Bug <a href='https://bugs.eclipse.org/316291'>316291</a>. [hotbug] Backport 292943 to wtp 3.0.5Patch</p>
-<p>Bug <a href='https://bugs.eclipse.org/317560'>317560</a>. Errors flagged by error annotations not reflected in the Problems, Explorer, and/or Navigator views.</p>
-<p>Bug <a href='https://bugs.eclipse.org/318736'>318736</a>. ImportDataModel unsafely checks java facet name</p>
-<p>Bug <a href='https://bugs.eclipse.org/319311'>319311</a>. Jars exported as variable names instead of jar names</p>
-<p>Bug <a href='https://bugs.eclipse.org/319439'>319439</a>. EAR Validation throws exceptions on project close</p>
-<p>Bug <a href='https://bugs.eclipse.org/319735'>319735</a>. Unwanted newlines before display name value</p>
-<p>Bug <a href='https://bugs.eclipse.org/320312'>320312</a>. NLS missing messages in .log</p>
-<p>Bug <a href='https://bugs.eclipse.org/320322'>320322</a>. [validation] JSP source validators running even when respective batch validators have been turned off</p>
-<p>Bug <a href='https://bugs.eclipse.org/320436'>320436</a>. jar's placed in Java EE 5 Ear's lib directory should never be considered "modules"</p>
-<p>Bug <a href='https://bugs.eclipse.org/322173'>322173</a>. J2EEDeployOperation does not allow callers to get a list of affected projects</p>
-<p>Bug <a href='https://bugs.eclipse.org/322411'>322411</a>. Weblib classpath dependencies not returned from members() when single-root</p>
-<p>Bug <a href='https://bugs.eclipse.org/322678'>322678</a>. In EARVirtualComponent.getHardReferences, need to get the archiveName directly from the referencedComponent, instead of getting it from the dependentObject</p>
-<p>Bug <a href='https://bugs.eclipse.org/322953'>322953</a>. J2EEDeployOperation affect projects support needs a way to tell if any deployer do not provide that info</p>
-<p>Bug <a href='https://bugs.eclipse.org/324221'>324221</a>. JavaEEArchiveUtilities.inLibDir needs to consider component parameter while returning result</p>
-<p>Bug <a href='https://bugs.eclipse.org/326015'>326015</a>. EarVirtualComponent needs to continue to use complete ArchiveName</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_core.feature.patch/epl-v10.html b/features/org.eclipse.jst.web_core.feature.patch/epl-v10.html
deleted file mode 100644
index e06ad62c2..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {   
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-    margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style>
-
-</head>
-
-<body lang="EN-US">
-
-<p align=center><b>Eclipse Public License - v 1.0</b></p>
-
-<p>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.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>&quot;Contribution&quot; means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">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.</p>
-
-<p>&quot;Contributor&quot; means any person or entity that distributes
-the Program.</p>
-
-<p>&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.</p>
-
-<p>&quot;Program&quot; means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>&quot;Recipient&quot; means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to 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.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-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.</p>
-
-<p class="list">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.</p>
-
-<p class="list">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.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">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;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">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.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>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.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>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.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
deleted file mode 100644
index d28695b33..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties
+++ /dev/null
@@ -1,255 +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 Patches for org.eclipse.jst.web_core.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=\
-The bugs and fixes are described in the following bugzilla entries:\n\
-\n\
-Bug https://bugs.eclipse.org/272389 tokenizers stuck in loop when input not matched\n\
-Bug https://bugs.eclipse.org/278131 StackOverflow thrown in JDOMSearchHelper.findInnerJavaElement\n\
-Bug https://bugs.eclipse.org/279038 JSP opens dirty if content type header misspells "charset"\n\
-Bug https://bugs.eclipse.org/279175 An internal error occurred during: "Validation TestEJB".\n\
-Bug https://bugs.eclipse.org/281147 problem adding ee5 libs to container\n\
-Bug https://bugs.eclipse.org/281562 Unsafe JDT calls in classpath container code\n\
-Bug https://bugs.eclipse.org/283176 NPE in EARArtifactEdit.getModuleByManifestURI(String uri)\n\
-Bug https://bugs.eclipse.org/283209 !MESSAGE Exception while reading /EAR5Client/.classpath\n\
-Bug https://bugs.eclipse.org/283318 Single root check failing when source folder mapped but deleted\n\
-Bug https://bugs.eclipse.org/283580 EAR 5.0 libs performance and missing updates\n\
-Bug https://bugs.eclipse.org/283601 For Web Project verify source folders and web content do not collide\n\
-Bug https://bugs.eclipse.org/283632 EJb ref validation in EAR validator need to throw error message\n\
-Bug https://bugs.eclipse.org/284302 Memory leaks in IArchive classes\n\
-Bug https://bugs.eclipse.org/284327 Memory leaks because of final static constants\n\
-Bug https://bugs.eclipse.org/284932 TaglibIndex optimization ignores important resource change events\n\
-Bug https://bugs.eclipse.org/285087 JSP Translator does not support IterationTag constructs\n\
-Bug https://bugs.eclipse.org/286937 ExceptionInInitializerError from TaglibHelper.isIterationTag in log\n\
-Bug https://bugs.eclipse.org/286969 Java string constants containing entity references get decoded\n\
-Bug https://bugs.eclipse.org/287742 EAR import showing ejb client jars on second page when it should not\n\
-Bug https://bugs.eclipse.org/287749 Core exceptions during EAR import\n\
-Bug https://bugs.eclipse.org/288184 Ear import fails if two EJB modules use same client jar\n\
-Bug https://bugs.eclipse.org/288832 IArchive performance problems with large amount of files within single archive\n\
-Bug https://bugs.eclipse.org/289203 Facet classpath utility not properly migrating legacy projects\n\
-Bug https://bugs.eclipse.org/288290 NPEs in TLDCMDocumentManager\n\
-Bug https://bugs.eclipse.org/289257 [translation] JSPTranslator should handle assignment in JSP expressions\n\
-Bug https://bugs.eclipse.org/290832 Backport the fix for bugzilla#260931 to wtp 3.0.5\n\
-Bug https://bugs.eclipse.org/290738 False errors/warnings when validating expressions with maps\n\
-Bug https://bugs.eclipse.org/290543 Backport the fix for bugilla#282936 to wtp 3.0.5\n\
-Bug https://bugs.eclipse.org/290412 Performance problem in method TypeUtil.resolveInParents()\n\
-Bug https://bugs.eclipse.org/290581 Manual validation is cleaning up the already validated cache on every call\n\
-Bug https://bugs.eclipse.org/290742 EAR Export not properly closing 1.4 archives\n\
-Bug https://bugs.eclipse.org/290757 'Prepare for Deployment' error message states "J2EEDeployOperation_2_UI_"\n\
-Bug https://bugs.eclipse.org/290837 Exceptions from JEM in adopter product\n\
-Bug https://bugs.eclipse.org/290966 JSP include directives do not handle non-JSP content types\n\
-Bug https://bugs.eclipse.org/291143 Mechanism to expose WEB-INF/lib classpath component dependencies\n\
-Bug https://bugs.eclipse.org/291225 Output folder support in JavaEE projects\n\
-Bug https://bugs.eclipse.org/291251 API needed to determine if project has no single root and reasons why\n\
-Bug https://bugs.eclipse.org/291266 Deleting java source folders should remove the corresponding artifacts from the .settings/org.eclipse.wst.common.component file\n\
-Bug https://bugs.eclipse.org/291536 Session Bean remote interface validation should be error for missing methods\n\
-Bug https://bugs.eclipse.org/249044 Web module's jar modules from another project are not published for Tomcat.\n\
-Bug https://bugs.eclipse.org/272013 JEM JemProjectUtilities#getClasspathAsURLArray(IJavaProject) fails to handle class folders\n\
-Bug https://bugs.eclipse.org/290739 Don't validate the expression segments after the map if the map value type is Object\n\
-Bug https://bugs.eclipse.org/292079 [parser] Scriptlet in <script> attribute tags can cause the region to not be block text\n\
-Bug https://bugs.eclipse.org/292081 [translation] Javascript can cause custom tags to not be translated\n\
-Bug https://bugs.eclipse.org/292162 isSingleRoot API should allow non Java src folder as output for JCA\n\
-Bug https://bugs.eclipse.org/292177 [validation] JSPDirectiveValidator#processTaglibDirective should handle URL Taglib Records\n\
-Bug https://bugs.eclipse.org/292186 WebLib Quick fixes reverting exclusions\n\
-Bug https://bugs.eclipse.org/293047 Problem with WTPWorkingCopyManager and deleting projects\n\
-Bug https://bugs.eclipse.org/293502 Performance degradation because of JavaLite calls\n\
-Bug https://bugs.eclipse.org/293685 JAX-RPC client JSPs: JSPG0036E: Failed to find resource /sampleEchoProxy/TestClient.jsp\n\
-Bug https://bugs.eclipse.org/293992 [validation] JSPBatchValidator is taking substantially longer when needed taglibs are not on class path\n\
-Bug https://bugs.eclipse.org/293981 [validation] Attributes do not indicate problems with dynamic content in rtexprvalue attributes\n\
-Bug https://bugs.eclipse.org/294369 EAR 5.0 Lib utility deployment\n\
-Bug https://bugs.eclipse.org/294490 EAR Libraries container miscomputing because of stale IJavaLite\n\
-Bug https://bugs.eclipse.org/293211 Performance problem when validate managed properties\n\
-Bug https://bugs.eclipse.org/294627 Deleting folders should remove entry from .settings/org.eclipse.wst.common.component file\n\
-Bug https://bugs.eclipse.org/295353 Adding module to application.xml no longer generating "id" attributes\n\
-Bug https://bugs.eclipse.org/294716 ClasspathDecorationsManager may cause SAXParseException\n\
-Bug https://bugs.eclipse.org/295617 Web project creation does not honour user input\n\
-Bug https://bugs.eclipse.org/295728 Deferred EL expressions are being marked with validation problems\n\
-Bug https://bugs.eclipse.org/296719 Runtime Change Delegate throws NPE when changing from Unknown Runtime type\n\
-Bug https://bugs.eclipse.org/298796 isSingleRoot API should not require a Java src folder\n\
-Bug https://bugs.eclipse.org/293504 [validation] JSP syntax validator requires brackets after IF statement\n\
-Bug https://bugs.eclipse.org/297852 Error log entry for ArrayIndexOutOfBoundsException related to Annotations and EMF\n\
-Bug https://bugs.eclipse.org/298891 Classpath initialization is very slow for complex EARs\n\
-Bug https://bugs.eclipse.org/299156 [parser] JSPTokenizer does not detect Unicode character references as you type\n\
-Bug https://bugs.eclipse.org/299393 Validation of runtime expressions in JSP custom tag attributes\n\
-Bug https://bugs.eclipse.org/299432 J2EE Deployment framework doesn't allow facet exclusions\n\
-Bug https://bugs.eclipse.org/299437 NPEs logged due to bug 295353\n\
-Bug https://bugs.eclipse.org/299488 [translation] XMLJSPRegionHelper#decodeRemainingRegions can cause NPE\n\
-Bug https://bugs.eclipse.org/299489 [content model] CMDocumentFactoryTLD#getContainedText can cause NPE\n\
-Bug https://bugs.eclipse.org/299541 Excessive logging in TaglibClassLoader\n\
-Bug https://bugs.eclipse.org/299655 ClasspathSelection needs better error handling\n\
-Bug https://bugs.eclipse.org/299785 HTML causes validation errors in Tag files\n\
-Bug https://bugs.eclipse.org/300062 Performance improvement of VirtualComponent caching\n\
-Bug https://bugs.eclipse.org/300098 'In Lib Dir' checkbox being ignored when a jar dependency is added to an EAR\n\
-Bug https://bugs.eclipse.org/300183 Componentcore.createComponent returns a null value when called from adopter product\n\
-Bug https://bugs.eclipse.org/300387 Need to protect against NPE in adopter J2EEElementChangedListener\n\
-Bug https://bugs.eclipse.org/301419 IllegalException thrown during deployment\n\
-Bug https://bugs.eclipse.org/301477 EAR Libraries container missing entries on restart\n\
-Bug https://bugs.eclipse.org/301540 Incorrect reporting of JSP problems\n\
-Bug https://bugs.eclipse.org/301598 [translation] Cannot be resolved errors when Struts <bean:define> is defined within <input type> HTML tag\n\
-Bug https://bugs.eclipse.org/303070 random build/compile error due to out of sync deployment descriptor\n\
-Bug https://bugs.eclipse.org/303140 ComponentArchiveSaveAdapter incorrectly handles .settings files\n\
-Bug https://bugs.eclipse.org/303131 J2EEComponentClasspathContainer.getEARLibDir should check both DD and facet version\n\
-Bug https://bugs.eclipse.org/303963 Error Exception logged during deploy\n\
-Bug https://bugs.eclipse.org/305252 ClassCastException:j2ee.application.internal.impl.ApplicationImpl incompatible with javaee.application.Application\n\
-Bug https://bugs.eclipse.org/305253 Performance issue in Manual EAR validation\n\
-Bug https://bugs.eclipse.org/306058 NoClassDefFoundError coming from the TaglibHelper\n\
-Bug https://bugs.eclipse.org/313181 Java EE import fails if zip entries contain leading slashes\n\
-Bug https://bugs.eclipse.org/313399 Opener of Archive didn't close a file\n\
-Bug https://bugs.eclipse.org/313608 random build/compile error due to out of sync files\n\
-Bug https://bugs.eclipse.org/313630 V1 Validator extension point changes for performance\n\
-Bug https://bugs.eclipse.org/316222 [parser] < or > in attribute values are not supported\n\
-Bug https://bugs.eclipse.org/316291 [hotbug] Backport 292943 to wtp 3.0.5Patch\n\
-Bug https://bugs.eclipse.org/317560 Errors flagged by error annotations not reflected in the Problems, Explorer, and/or Navigator views.\n\
-Bug https://bugs.eclipse.org/318736 ImportDataModel unsafely checks java facet name\n\
-Bug https://bugs.eclipse.org/319311 Jars exported as variable names instead of jar names\n\
-Bug https://bugs.eclipse.org/319439 EAR Validation throws exceptions on project close\n\
-Bug https://bugs.eclipse.org/319735 Unwanted newlines before display name value\n\
-Bug https://bugs.eclipse.org/320312 NLS missing messages in .log\n\
-Bug https://bugs.eclipse.org/320322 [validation] JSP source validators running even when respective batch validators have been turned off\n\
-Bug https://bugs.eclipse.org/320436 jar's placed in Java EE 5 Ear's lib directory should never be considered "modules"\n\
-Bug https://bugs.eclipse.org/322173 J2EEDeployOperation does not allow callers to get a list of affected projects\n\
-Bug https://bugs.eclipse.org/322411 Weblib classpath dependencies not returned from members() when single-root\n\
-Bug https://bugs.eclipse.org/322678 In EARVirtualComponent.getHardReferences, need to get the archiveName directly from the referencedComponent, instead of getting it from the dependentObject\n\
-Bug https://bugs.eclipse.org/322953 J2EEDeployOperation affect projects support needs a way to tell if any deployer do not provide that info\n\
-Bug https://bugs.eclipse.org/324221 JavaEEArchiveUtilities.inLibDir needs to consider component parameter while returning result\n\
-Bug https://bugs.eclipse.org/326015 EarVirtualComponent needs to continue to use complete ArchiveName\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\
-August, 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.jst.web_core.feature.patch/feature.xml b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
deleted file mode 100644
index e1656cbfd..000000000
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_core.feature.patch"
-      label="%featureName"
-      version="3.0.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.web_core.feature" version="3.0.5.v200904242131-7Q7AEfJEHhHehPlW6SaE4u" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.annotations.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.common.frameworks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsp.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.jsf.standard.tagsupport"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature.patch/license.html b/features/org.eclipse.jst.web_core.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.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.jst.web_ui.feature.patch/.cvsignore b/features/org.eclipse.jst.web_ui.feature.patch/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/.project b/features/org.eclipse.jst.web_ui.feature.patch/.project
deleted file mode 100644
index 4603a674b..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.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.jst.web_ui.feature.patch/build.properties b/features/org.eclipse.jst.web_ui.feature.patch/build.properties
deleted file mode 100644
index 82a5a4cbe..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               buildnotes_org.eclipse.jst.web_ui.feature.patch.html
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html b/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html
deleted file mode 100644
index fbe612663..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/buildnotes_org.eclipse.jst.web_ui.feature.patch.html
+++ /dev/null
@@ -1,20 +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.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 3.0.5 Patches</h1>
-
-<p>Bug <a href='https://bugs.eclipse.org/280483'>280483</a>. "A handler conflict occurred. This may disable some commands." warning on restart</p>
-<p>Bug <a href='https://bugs.eclipse.org/285284'>285284</a>. Removing comment end tag and adding it back leaves validation errors</p>
-<p>Bug <a href='https://bugs.eclipse.org/316431'>316431</a>. Error annotations not removed from the JSP structured text editor upon resolution</p>
-<p>Bug <a href='https://bugs.eclipse.org/317560'>317560</a>. Errors flagged by error annotations not reflected in the Problems, Explorer, and/or Navigator views.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html b/features/org.eclipse.jst.web_ui.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.jst.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.jst.web_ui.feature.patch/feature.properties b/features/org.eclipse.jst.web_ui.feature.patch/feature.properties
deleted file mode 100644
index ab3264afc..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,150 +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
-###############################################################################
-# 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 jst.web_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=\
-This patch fixes problems described in the following bugs: \n\
-Bug https://bugs.eclipse.org/280483 "A handler conflict occurred. This may disable some commands." warning on restart\n\
-Bug https://bugs.eclipse.org/285284 Removing comment end tag and adding it back leaves validation errors\n\
-Bug https://bugs.eclipse.org/316431 Error annotations not removed from the JSP structured text editor upon resolution\n\
-Bug https://bugs.eclipse.org/317560 Errors flagged by error annotations not reflected in the Problems, Explorer, and/or Navigator views.\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\
-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\
-\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.jst.web_ui.feature.patch/feature.xml b/features/org.eclipse.jst.web_ui.feature.patch/feature.xml
deleted file mode 100644
index 7cdd88092..000000000
--- a/features/org.eclipse.jst.web_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.web_ui.feature.patch"
-      label="%featureName"
-      version="3.0.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.web_ui.feature" version="3.0.5.v200903300031-7E4EAzDgz-Y1itBi74t4CUmX7TbF" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.jsp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature.patch/license.html b/features/org.eclipse.jst.web_ui.feature.patch/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.jst.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/plugins/org.eclipse.jst.j2ee.core/.classpath b/plugins/org.eclipse.jst.j2ee.core/.classpath
deleted file mode 100644
index ac3003956..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="mofj2ee"/>
-	<classpathentry kind="src" path="webservices"/>
-	<classpathentry kind="src" path="commonArchive"/>
-	<classpathentry kind="src" path="j2ee-validation"/>
-	<classpathentry kind="src" path="j2eeCorePlugin"/>
-	<classpathentry kind="src" path="archive"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="jee-models"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.core/.cvsignore b/plugins/org.eclipse.jst.j2ee.core/.cvsignore
deleted file mode 100644
index b39f8f47b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-runtime
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.core/.project b/plugins/org.eclipse.jst.j2ee.core/.project
deleted file mode 100644
index fc4f457ee..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.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/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ccaa9be70..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Wed Jun 24 10:13:32 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 1dd89f7e4..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue May 08 16:50:10 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 9af85f75a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,129 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true
-Bundle-Version: 1.2.2.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.application,
- org.eclipse.jst.j2ee.application.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.application.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.client,
- org.eclipse.jst.j2ee.client.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.client.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.common,
- org.eclipse.jst.j2ee.common.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.common.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.exception;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.core.internal.bindings;x-internal:=true,
- org.eclipse.jst.j2ee.core.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.core.internal.validation.xmlerrorcustomization;x-internal:=true,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.ejb.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.ejb.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal;x-internal:=true,
- org.eclipse.jst.j2ee.internal.common;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.application;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.client;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.common;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.connector;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.ejb;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.webapplication;x-internal:=true,
- org.eclipse.jst.j2ee.internal.model.translator.webservices;x-internal:=true,
- org.eclipse.jst.j2ee.internal.xml;x-internal:=true,
- org.eclipse.jst.j2ee.jca,
- org.eclipse.jst.j2ee.jca.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.jca.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.jsp,
- org.eclipse.jst.j2ee.jsp.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.jsp.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.model.internal.validation;x-internal:=true,
- org.eclipse.jst.j2ee.taglib.internal;x-internal:=true,
- org.eclipse.jst.j2ee.taglib.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.taglib.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webapplication,
- org.eclipse.jst.j2ee.webapplication.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webapplication.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.internal;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.internal.wsdd;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.jaxrpcmap,
- org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsclient,
- org.eclipse.jst.j2ee.webservice.wsclient.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsclient.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wscommon,
- org.eclipse.jst.j2ee.webservice.wscommon.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wscommon.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsdd,
- org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;x-internal:=true,
- org.eclipse.jst.j2ee.webservice.wsdd.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.application,
- org.eclipse.jst.javaee.application.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.application.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.application.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.applicationclient,
- org.eclipse.jst.javaee.applicationclient.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.applicationclient.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.applicationclient.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.core,
- org.eclipse.jst.javaee.core.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.core.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.core.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.ejb,
- org.eclipse.jst.javaee.ejb.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.ejb.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.ejb.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.internal.adapter,
- org.eclipse.jst.javaee.jca,
- org.eclipse.jst.javaee.jca.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.jca.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.jca.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.jsp,
- org.eclipse.jst.javaee.jsp.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.jsp.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.jsp.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.web,
- org.eclipse.jst.javaee.web.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.web.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.web.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.webapp,
- org.eclipse.jst.javaee.webapp.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.webapp.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.webapp.internal.util;x-internal:=true,
- org.eclipse.jst.javaee.webfragment,
- org.eclipse.jst.javaee.webfragment.internal.impl;x-internal:=true,
- org.eclipse.jst.javaee.webfragment.internal.metadata;x-internal:=true,
- org.eclipse.jst.javaee.webfragment.internal.util;x-internal:=true,
- org.eclipse.jst.jee.application,
- org.eclipse.jst.jee.archive,
- org.eclipse.jst.jee.archive.internal;x-internal:=true,
- org.eclipse.jst.jee.util.internal;x-internal:=true
-Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore,
- org.eclipse.jdt.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="1.1.400"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.core/about.html b/plugins/org.eclipse.jst.j2ee.core/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.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/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java
deleted file mode 100644
index 95a2bab65..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-/**
- * Abstract implementation of {@link IArchiveAdapter} intended for subclassing
- * by clients. See {@link IArchiveAdapter} for details. Clients will, however,
- * most likely wish to subclss either {@link AbstractArchiveLoadAdapter} or
- * {@link AbstractArchiveSaveAdapter} instead.
- */
-public abstract class AbstractArchiveAdapter implements IArchiveAdapter {
-
-	protected IArchive archive = null;
-
-	public IArchive getArchive() {
-		return archive;
-	}
-
-	public void setArchive(IArchive archive) {
-		this.archive = archive;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveHandler.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveHandler.java
deleted file mode 100644
index b40c2c712..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-/**
- * Abstract implementation of {@link IArchiveHandler} intended for subclassing
- * by clients. See {@link IArchiveHandler} for details.
- */
-public abstract class AbstractArchiveHandler implements IArchiveHandler {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveLoadAdapter.java
deleted file mode 100644
index 454bec663..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveLoadAdapter.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.jee.archive.internal.ArchiveResourceImpl;
-import org.eclipse.jst.jee.archive.internal.ZipStreamArchiveSaveAdapterImpl;
-
-/**
- * Abstract implementation of {@link IArchiveLoadAdapter} intended for
- * subclassing by clients. See {@link IArchiveLoadAdapter} for details.
- */
-public abstract class AbstractArchiveLoadAdapter extends AbstractArchiveAdapter implements IArchiveLoadAdapter {
-
-	/**
-	 * Subclasses may wish to override.
-	 */
-	public void close() {
-	}
-
-	/**
-	 * Utility method for creating an {@link IArchiveResource} representing a
-	 * directory entry for the passed {@link IPath}.
-	 * 
-	 * @param path
-	 * @return
-	 */
-	protected IArchiveResource createDirectory(IPath archiveRelativePath) {
-		verifyRelative(archiveRelativePath);
-		IArchiveResource aFile = null;
-		aFile = new ArchiveResourceImpl();
-		aFile.setPath(archiveRelativePath);
-		aFile.setType(IArchiveResource.DIRECTORY_TYPE);
-		aFile.setArchive(getArchive());
-		return aFile;
-	}
-
-	/**
-	 * Utility method for creating an {@link IArchiveResource} representing a
-	 * file entry for the passed {@link IPath}.
-	 * 
-	 * @param path
-	 * @return
-	 */
-	protected IArchiveResource createFile(IPath archiveRelativePath) {
-		verifyRelative(archiveRelativePath);
-		IArchiveResource aFile = null;
-		aFile = new ArchiveResourceImpl();
-		aFile.setPath(archiveRelativePath);
-		aFile.setType(IArchiveResource.FILE_TYPE);
-		aFile.setArchive(getArchive());
-		return aFile;
-	}
-
-	/**
-	 * Utility method for creating an empty {@link IArchiveResource} manfiest
-	 * file.
-	 * 
-	 * @param manifestPath
-	 * @return
-	 */
-	protected IArchiveResource createManifest(IPath manifestPath) {
-		verifyRelative(manifestPath);
-		IArchiveResource manifest = null;
-		manifest = new ArchiveResourceImpl() {
-			@Override
-			public InputStream getInputStream() throws FileNotFoundException, IOException {
-				String manifestContents = "Manifest-Version: 1.0\r\n\r\n"; //$NON-NLS-1$
-				return new BufferedInputStream(new ByteArrayInputStream(manifestContents.getBytes()));
-			}
-		};
-		manifest.setPath(manifestPath);
-		manifest.setType(IArchiveResource.FILE_TYPE);
-		manifest.setArchive(getArchive());
-		return manifest;
-	}
-
-	public static void verifyRelative(IPath archiveRelativePath) {
-		if (archiveRelativePath.isAbsolute() && !archiveRelativePath.equals(IArchive.EMPTY_MODEL_PATH)) {
-			throw new RuntimeException(archiveRelativePath + " must be relative."); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Default implementation; subclasses should override as necessary.
-	 */
-	public InputStream getInputStream(IArchiveResource archiveResource) throws IOException, FileNotFoundException {
-		if (archiveResource.getType() == IArchive.ARCHIVE_TYPE) {
-			IArchive thisArchive = (IArchive) archiveResource;
-			ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
-			IArchiveSaveAdapter saveAdapter = new ZipStreamArchiveSaveAdapterImpl(byteOut);
-			ArchiveOptions archiveOptions = new ArchiveOptions();
-			archiveOptions.setOption(ArchiveOptions.SAVE_ADAPTER, saveAdapter);
-			try {
-				IArchiveFactory.INSTANCE.saveArchive(thisArchive, archiveOptions, new NullProgressMonitor());
-			} catch (ArchiveSaveFailureException e) {
-				throw new IOException("Unable to save nested Archive " + archiveResource.getPath() + " nested exception = " + e.getMessage()); //$NON-NLS-1$//$NON-NLS-2$
-			}
-			return new ByteArrayInputStream(byteOut.toByteArray());
-		}
-		return null;
-	}
-
-	/**
-	 * Default implementation; subclasses should override as necessary.
-	 */
-	public boolean containsArchiveResource(IPath resourcePath) {
-		return false;
-	}
-
-	/**
-	 * Default implementation; subclasses should override as necessary.
-	 */
-	public boolean containsModelObject(IPath modelObjectPath) {
-		return false;
-	}
-
-	/**
-	 * Default implementation; subclasses should override as necessary.
-	 */
-	public IArchiveResource getArchiveResource(IPath resourcePath) throws FileNotFoundException {
-		return null;
-	}
-
-	/**
-	 * Default implementation; subclasses should override as necessary.
-	 */
-	public List<IArchiveResource> getArchiveResources() {
-		return null;
-	}
-
-	/**
-	 * Default implementation; subclasses should override as necessary.
-	 */
-	public Object getModelObject(IPath modelObjectPath) throws ArchiveModelLoadException {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java
deleted file mode 100644
index e93224107..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-
-/**
- * Abstract implementation of {@link IArchiveSaveAdapter} intended for
- * subclassing by clients. See {@link IArchiveSaveAdapter} for details.
- */
-public abstract class AbstractArchiveSaveAdapter extends AbstractArchiveAdapter implements IArchiveSaveAdapter {
-
-	public void close() throws IOException {
-	}
-
-	public void finish() throws IOException {
-	}
-
-	protected IArchiveResource manifest = null; 
-	protected IArchiveResource metaInf = null; 
-	
-	public void save(IProgressMonitor monitor) throws ArchiveSaveFailureException {
-		final int GATHER_RESOURCES_TICKS = 1000;
-		final int SAVE_RESOURCES_TICKS = 1000;
-		final int FINISH_TICKS = 10;
-		final int TOTAL_TICKS = GATHER_RESOURCES_TICKS + SAVE_RESOURCES_TICKS + FINISH_TICKS;
-		Exception caughtException = null;
-		try {
-			monitor.beginTask(CommonArchiveResourceHandler.AbstractArchiveSaveAdapter_Saving_resource_, TOTAL_TICKS);
-			
-			List<IArchiveResource> files = getArchiveResourcesForSave();
-			IPath manifestPath = new Path("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-			if(getArchive().containsArchiveResource(manifestPath)){
-				manifest = getArchive().getArchiveResource(manifestPath);
-			}
-			IPath metaInfPath = manifestPath.removeFirstSegments(1);
-			if(getArchive().containsArchiveResource(metaInfPath)){
-				metaInf = getArchive().getArchiveResource(metaInfPath);
-			}
-				
-			monitor.worked(GATHER_RESOURCES_TICKS);
-			IProgressMonitor saveSubMonitor = new SubProgressMonitor(monitor, SAVE_RESOURCES_TICKS);
-			int SUB_SAVE_TICKS = 10;
-			int SUB_TOTAL_TICKS = SUB_SAVE_TICKS * (files.size() + 2);
-			try {
-				saveSubMonitor.beginTask(CommonArchiveResourceHandler.AbstractArchiveSaveAdapter_Saving_resource_, SUB_TOTAL_TICKS);
-				if(manifest != null){
-					save(manifest);
-				}
-				saveSubMonitor.worked(SUB_SAVE_TICKS);
-				if(metaInf != null){
-					save(metaInf);
-				}
-				saveSubMonitor.worked(SUB_SAVE_TICKS);
-				for (IArchiveResource file : files) {
-					if (shouldSave(file)) {
-						save(file);
-					}
-					saveSubMonitor.worked(SUB_SAVE_TICKS);
-				}
-			} finally {
-				saveSubMonitor.done();
-			}
-		} catch(Exception e){
-			caughtException = e;
-		} finally {
-			try {
-				finish();
-			} catch (IOException e) {
-				throw new ArchiveSaveFailureException(e);
-			} finally {
-				monitor.done();
-				if(caughtException != null){
-					throw new ArchiveSaveFailureException(caughtException);
-				}
-			}
-		}
-	}
-
-	protected List<IArchiveResource> getArchiveResourcesForSave() {
-		List<IArchiveResource> files = getArchive().getArchiveResources();
-		return files;
-	}
-
-	/**
-	 * Subclasses should implement to perform the actual save on the specified
-	 * {@link IArchiveResource}.
-	 * 
-	 * @param file
-	 * @throws ArchiveSaveFailureException
-	 */
-	protected abstract void save(IArchiveResource file) throws ArchiveSaveFailureException;
-
-	/**
-	 * Subclassess should override to avoid saving the specified
-	 * {@link IArchiveResource}. e.g. to avoid saving source files.
-	 * 
-	 * @param file
-	 * @return
-	 */
-	protected boolean shouldSave(IArchiveResource file) {
-		if(file == manifest || file == metaInf){
-			return false;
-		}
-		return true;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveException.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveException.java
deleted file mode 100644
index fcb420f1c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-public class ArchiveException extends Exception {
-
-	private static final long serialVersionUID = 3796439415310903317L;
-
-	public ArchiveException() {
-		super();
-	}
-
-	public ArchiveException(String message) {
-		super(message);
-	}
-
-	public ArchiveException(Throwable cause) {
-		super(cause);
-	}
-	
-	public ArchiveException(String message, Throwable cause){
-		super(message, cause);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveModelLoadException.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveModelLoadException.java
deleted file mode 100644
index c8f0a3797..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveModelLoadException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-public class ArchiveModelLoadException extends ArchiveException {
-
-	private static final long serialVersionUID = 4103220169134334112L;
-
-	public ArchiveModelLoadException(String message) {
-		super(message);
-	}
-	
-	public ArchiveModelLoadException(Throwable cause){
-		super(cause);
-	}
-	
-	public ArchiveModelLoadException(String message, Throwable cause){
-		super(message, cause);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java
deleted file mode 100644
index 053a0e9b1..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-public class ArchiveOpenFailureException extends ArchiveException {
-
-	private static final long serialVersionUID = -7366116122777721148L;
-
-	public ArchiveOpenFailureException(String message) {
-		super(message);
-	}
-
-	public ArchiveOpenFailureException(Throwable cause){
-		super(cause);
-	}
-	
-	public ArchiveOpenFailureException(String message, Throwable cause){
-		super(message, cause);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java
deleted file mode 100644
index 21b34fee7..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * {@link ArchiveOptions} is a means for passing data pertaining to opening and
- * saving {@link IArchive}s. This class is simply a wrapper around {@link Map}
- * and a few well defined OptionKeys. Clients are welcome to define and set/get
- * any options deemed necessary.
- * 
- * This class is not intended to be subclassed by clients.
- */
-public class ArchiveOptions {
-
-	// TODO add debug tracing support
-
-	/**
-	 * An OptionKey used for specifying an {@link IArchiveLoadAdapter}.
-	 */
-	public static final String LOAD_ADAPTER = "LOAD_ADAPTER"; //$NON-NLS-1$
-
-	/**
-	 * An OptionKey used for specifying an {@link IArchiveSaveAdapter}.
-	 */
-	public static final String SAVE_ADAPTER = "SAVE_ADAPTER"; //$NON-NLS-1$
-	
-	/**
-	 * An OptionKey used for specifying the path for the Archive.
-	 */
-	public static final String ARCHIVE_PATH = "ARCHIVE_PATH"; //$NON-NLS-1$
-	
-	/**
-	 * An OptionKey used to specify the parent Archive used when opening nested Archives.
-	 */
-	public static final String PARENT_ARCHIVE = "PARENT_ARCHIVE"; //$NON-NLS-1$
-	
-	private Map optionsMap = new HashMap();
-
-	public ArchiveOptions() {
-	}
-
-	public boolean hasOption(Object optionKey) {
-		return optionsMap.containsKey(optionKey);
-	}
-
-	public Object getOption(Object optionKey) {
-		return optionsMap.get(optionKey);
-	}
-
-	@SuppressWarnings("unchecked")
-	public void setOption(Object optionKey, Object optionValue) {
-		optionsMap.put(optionKey, optionValue);
-	}
-	
-	public void removeOption(Object optionKey){
-		optionsMap.remove(optionKey);
-	}
-	
-	public Set keySet(){
-		return optionsMap.keySet();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveSaveFailureException.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveSaveFailureException.java
deleted file mode 100644
index 4fb8e0558..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveSaveFailureException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-public class ArchiveSaveFailureException extends ArchiveException {
-
-	private static final long serialVersionUID = 9102704379415366068L;
-
-	public ArchiveSaveFailureException(String message) {
-		super(message);
-	}
-
-	public ArchiveSaveFailureException(Throwable cause) {
-		super(cause);
-	}
-	
-	public ArchiveSaveFailureException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java
deleted file mode 100644
index d23f12594..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * This interface is not intended to be implemented by clients.
- * 
- * @author jasholl
- */
-public interface IArchive extends IArchiveResource {
-
-	IPath EMPTY_MODEL_PATH = new Path("/"); //$NON-NLS-1$
-
-	public boolean isOpen();
-
-	public boolean containsArchiveResource(IPath archiveRelativePath);
-
-	/**
-	 * Returns the {@link IArchiveResource} specified by the archive relative
-	 * path. Throws a {@link RuntimeException} if the specified path is not
-	 * relative.
-	 * 
-	 * @param archiveRelativePath
-	 * @return
-	 * @throws java.io.FileNotFoundException
-	 */
-	public IArchiveResource getArchiveResource(IPath archiveRelativePath) throws java.io.FileNotFoundException;
-
-	/**
-	 * Returns an {@link IArchive} for the specified archiveResource. If the
-	 * {@link IArchive} is successfully returned, it will be added to the list
-	 * returned by {@link #getNestedArchives()}. Also, the original
-	 * {@link IArchiveResource} will be removed from this {@link IArchive}'s
-	 * list of {@link IArchiveResource}s returned by
-	 * {@link #getArchiveResources()} and replaced with the returned
-	 * {@link IArchive}.
-	 * 
-	 * @param archiveResource
-	 * @return
-	 * @throws ArchiveOpenFailureException
-	 */
-	public IArchive getNestedArchive(IArchiveResource archiveResource) throws ArchiveOpenFailureException;
-
-	public List<IArchive> getNestedArchives();
-
-	/**
-	 * Returns a list of all {@link IArchiveResource}s in the archive.
-	 * 
-	 * @return
-	 */
-	public List<IArchiveResource> getArchiveResources();
-
-	public boolean containsModelObject();
-
-	public boolean containsModelObject(IPath modelObjectPath);
-
-	public Object getModelObject() throws ArchiveModelLoadException;
-
-	public Object getModelObject(IPath modelObjectPath) throws ArchiveModelLoadException;
-
-	public ArchiveOptions getArchiveOptions();
-
-	public IArchiveLoadAdapter getLoadAdapter();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java
deleted file mode 100644
index 0fb0bb93f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java
+++ /dev/null
@@ -1,40 +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.jst.jee.archive;
-
-/**
- * An {@link IArchiveAdapter} provides a bridge so any {@link Object} (or
- * collection of {@link Object}s) may be represented as an {@link IArchive}.
- * Each {@link IArchiveAdapter} should only be used by one {@link IArchive} at a
- * time.
- * 
- * This interface is not intended to be implemented by or subclassed by clients.
- * Clients should instead subclass {@link AbstractArchiveAdapter} or one if its
- * subclasses.
- */
-public interface IArchiveAdapter {
-
-	/**
-	 * Returns the {@link IArchive} associated with this adapter. Every
-	 * {@link IArchiveAdapter} is associated with exactly one {@link IArchive}.
-	 * 
-	 * @return
-	 */
-	public IArchive getArchive();
-
-	/**
-	 * Sets the {@link IArchive} for this {@link IArchiveAdapter}.
-	 * 
-	 * @param archive
-	 */
-	public void setArchive(IArchive archive);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java
deleted file mode 100644
index 86ad66fe8..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.jee.archive.internal.ArchiveFactoryImpl;
-
-/**
- * {@link IArchiveFactory} is the where clients should open and save archives.
- * 
- * This interface is not intended to be implemented or subclassed by clients.
- * Clients should access through {@link #INSTANCE}
- */
-public interface IArchiveFactory {
-
-	/**
-	 * A concrete implementation of {@link IArchiveFactory}.
-	 */
-	IArchiveFactory INSTANCE = new ArchiveFactoryImpl();
-
-	public IArchive openArchive(IPath archivePath) throws ArchiveOpenFailureException;
-
-	public IArchive openArchive(ArchiveOptions archiveOptions) throws ArchiveOpenFailureException;
-
-	public void closeArchive(IArchive archive);
-
-	public void saveArchive(IArchive archive, IPath outputPath, IProgressMonitor monitor) throws ArchiveSaveFailureException;
-
-	public void saveArchive(IArchive archive, ArchiveOptions archiveOptions, IProgressMonitor monitor) throws ArchiveSaveFailureException;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java
deleted file mode 100644
index 1bb5c192d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-/**
- * An {@link IArchiveHandler} handles a specific type of {@link IArchive}.
- * {@link IArchiveHandler}s are defined via extension points.
- * 
- * This interface is not intended to be implemented by or subclassed by clients.
- * Clients should instead subclass {@link AbstractArchiveHandler} or one if its
- * subclasses.
- */
-public interface IArchiveHandler {
-
-	/**
-	 * Returns <code>true</code> if this {@link IArchiveHandler} can handle
-	 * the specified {@link IArchive}. Various {@link IArchive} types may be
-	 * determined by examining the contents of the {@link IArchive}. e.g. by
-	 * the existence of certain {@link IArchiveResource}s or their contents.
-	 * 
-	 * @param archive
-	 * @return
-	 */
-	public boolean handlesArchive(IArchive archive);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java
deleted file mode 100644
index 711ecb26d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * {@link IArchiveLoadAdapter} knows how to load or read the contents for an
- * {@link IArchive}. This provides a delegation model for reading in the
- * contents of an {@link IArchive}.
- * 
- * By extending {@link AbstractArchiveLoadAdapter} and using
- * {@link ArchiveOptions} clients may "plug in" to an instance of an
- * {@link IArchive}. Examples might include reading from a zip file, from an
- * input stream, from the local file system, or from a workbench.
- * 
- * This interface is not intended to be implemented by or subclassed by clients.
- * Clients should instead subclass {@link AbstractArchiveLoadAdapter} or one if
- * its subclasses.
- */
-public interface IArchiveLoadAdapter extends IArchiveAdapter {
-
-	/**
-	 * Called to release any resources held by this {@link IArchiveLoadAdapter}.
-	 */
-	public void close();
-
-	/**
-	 * Returns <code>true</code> if this {@link IArchiveLoadAdapter} contains
-	 * the {@link IArchiveResource} specified by the passed {@link IPath}. If
-	 * this method returns <code>true</code> then this
-	 * {@link IArchiveLoadAdapter} should be able to successfully return an
-	 * {@link IArchiveResource} from {@link #getArchiveResource(IPath)} using an
-	 * equal passed {@link IPath}.
-	 * 
-	 * @param resourcePath
-	 * @return
-	 */
-	public boolean containsArchiveResource(IPath resourcePath);
-
-	/**
-	 * Returns the {@link IArchiveResource} specified by the passed
-	 * {@link IPath}. A {@link FileNotFoundException} is thrown if this
-	 * {@link IArchiveLoadAdapter} does not contain the {@link IArchiveResource}
-	 * as specified by {@link #containsArchiveResource(IPath)}.
-	 * 
-	 * @param resourcePath
-	 * @return
-	 * @throws FileNotFoundException
-	 */
-	public IArchiveResource getArchiveResource(IPath resourcePath) throws FileNotFoundException;
-
-	/**
-	 * Returns a {@link List} of all {@link IArchiveResource} contained by this
-	 * {@link IArchiveLoadAdapter}.
-	 * 
-	 * @return
-	 */
-	public List <IArchiveResource> getArchiveResources();
-
-	/**
-	 * Returns an {@link InputStream} for the specified {@link IArchiveResource}.
-	 * If the specified {@link IArchiveResource} is not contained by this
-	 * {@link IArchiveLoadAdapter}, then a {@link FileNotFoundException} is
-	 * thrown. An {@link IOException} is thrown for all other errors.
-	 * 
-	 * @param archiveResource
-	 * @return
-	 * @throws IOException
-	 * @throws FileNotFoundException
-	 */
-	public InputStream getInputStream(IArchiveResource archiveResource) throws IOException, FileNotFoundException;
-
-	/**
-	 * Returns <code>true</code> if this {@link IArchiveLoadAdapter} contains
-	 * a model Object specified by the passed {@link IPath}.
-	 * 
-	 * @param modelObjectPath
-	 * @return
-	 */
-	public boolean containsModelObject(IPath modelObjectPath);
-
-	/**
-	 * Returns the model Object specified by the passed {@link IPath}. An
-	 * {@link ArchiveModelLoadException} is thrown if this
-	 * {@link IArchiveLoadAdapter} does not contain the model Object as
-	 * specified by {@link #containsModelObject(IPath)}.
-	 * 
-	 * @param modelObjectPath
-	 * @return
-	 * @throws ArchiveModelLoadException
-	 */
-	public Object getModelObject(IPath modelObjectPath) throws ArchiveModelLoadException;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java
deleted file mode 100644
index edde770ea..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * This interface is not intended to be implemented by clients.
- * 
- * @author jasholl
- * 
- */
-public interface IArchiveResource {
-
-	public static int UNKNOWN_TYPE = -1;
-
-	public static int FILE_TYPE = 0;
-
-	public static int DIRECTORY_TYPE = 1;
-
-	public static int ARCHIVE_TYPE = 2;
-
-	public IPath getPath();
-
-	public void setPath(IPath path);
-
-	public long getSize();
-
-	public void setSize(long size);
-
-	public long getLastModified();
-
-	public void setLastModified(long lastModified);
-
-	public int getType();
-
-	public void setType(int fileType);
-
-	public IArchive getArchive();
-
-	public void setArchive(IArchive archive);
-
-	/**
-	 * Returns an input stream for this {@link IArchiveResource} if its type is
-	 * either a {@link #FILE_TYPE} or {@link #ARCHIVE_TYPE} as defined by
-	 * {@link #getType()}. <code>null</code> is returned if the type is
-	 * {@link #DIRECTORY_TYPE}.
-	 * 
-	 * @return
-	 * @throws java.io.FileNotFoundException
-	 * @throws java.io.IOException
-	 */
-	public InputStream getInputStream() throws java.io.FileNotFoundException, java.io.IOException;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveSaveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveSaveAdapter.java
deleted file mode 100644
index 3def8041c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveSaveAdapter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public interface IArchiveSaveAdapter extends IArchiveAdapter {
-
-	/**
-	 * Close and release any resources being held by this object
-	 */
-	public void close() throws java.io.IOException;
-
-	/**
-	 * Notify resources if necessary that save is complete for this archive,
-	 * being careful not to close any resources that a parent archive might
-	 * still be using
-	 */
-	public void finish() throws java.io.IOException;
-
-	public void save(IProgressMonitor monitor) throws ArchiveSaveFailureException;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveFactoryImpl.java
deleted file mode 100644
index 76374f89d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveFactoryImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.IOException;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.jee.archive.ArchiveOpenFailureException;
-import org.eclipse.jst.jee.archive.ArchiveOptions;
-import org.eclipse.jst.jee.archive.ArchiveSaveFailureException;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveFactory;
-import org.eclipse.jst.jee.archive.IArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.osgi.util.NLS;
-
-public class ArchiveFactoryImpl implements IArchiveFactory {
-
-	public IArchive openArchive(IPath archivePath) throws ArchiveOpenFailureException {
-		java.io.File file = new java.io.File(archivePath.toOSString());
-		ZipFile zipFile;
-		try {
-			zipFile = ArchiveUtil.newZipFile(file);
-		} catch (ZipException e) {
-			ArchiveOpenFailureException openFailureException = new ArchiveOpenFailureException(e);
-			throw openFailureException;
-		} catch (IOException e) {
-			ArchiveOpenFailureException openFailureException = new ArchiveOpenFailureException(e);
-			throw openFailureException;
-		}
-		ZipFileArchiveLoadAdapterImpl loadAdapter = new ZipFileArchiveLoadAdapterImpl(zipFile);
-		ArchiveOptions archiveOptions = new ArchiveOptions();
-		archiveOptions.setOption(ArchiveOptions.LOAD_ADAPTER, loadAdapter);
-		archiveOptions.setOption(ArchiveOptions.ARCHIVE_PATH, archivePath);
-		return openArchive(archiveOptions);
-	}
-
-	// TODO add tracing support
-	// info in spec page 154
-	public IArchive openArchive(ArchiveOptions archiveOptions) throws ArchiveOpenFailureException {
-		ArchiveImpl archive = new ArchiveImpl(archiveOptions);
-		archive.setArchiveFactory(this);
-		return archive;
-	}
-
-	public void closeArchive(IArchive archive) {
-		((ArchiveImpl) archive).close();
-		// TODO add tracing support
-	}
-	
-	public void saveArchive(IArchive archive, IPath outputPath, IProgressMonitor monitor) throws ArchiveSaveFailureException {
-		final int SAVE_TICKS = 198;
-		final int CLEANUP_TICKS = 1;
-		final int TOTAL_TICKS = SAVE_TICKS + CLEANUP_TICKS;
-		try {
-			monitor.beginTask(NLS.bind(CommonArchiveResourceHandler.ArchiveFactoryImpl_Saving_archive_to_0_, outputPath.toOSString()), TOTAL_TICKS);
-			String aUri = outputPath.toOSString();
-			java.io.File aFile = new java.io.File(aUri);
-			ArchiveUtil.checkWriteable(aFile);
-			boolean fileExisted = aFile.exists();
-			IArchiveSaveAdapter aSaveAdapter = null;
-			try {
-				java.io.File destinationFile = fileExisted ? ArchiveUtil.createTempFile(aUri, aFile.getCanonicalFile().getParentFile()) : aFile;
-				aSaveAdapter = createSaveAdapterForJar(destinationFile);
-				aSaveAdapter.setArchive(archive);
-				save(aSaveAdapter, new SubProgressMonitor(monitor, SAVE_TICKS));
-
-				aSaveAdapter.close();
-				if (fileExisted) {
-					ArchiveUtil.cleanupAfterTempSave(aUri, aFile, destinationFile);
-				}
-				monitor.worked(CLEANUP_TICKS);
-			} catch (java.io.IOException e) {
-				throw new ArchiveSaveFailureException(NLS.bind(CommonArchiveResourceHandler.ArchiveFactoryImpl_Error_saving_archive_0_to_output_, new Object[] { archive, outputPath }), e);
-			} catch (ArchiveSaveFailureException failure) {
-				try {
-					if (aSaveAdapter != null)
-						aSaveAdapter.close();
-				} catch (IOException weTried) {
-					// Ignore
-				}
-				if (!fileExisted)
-					aFile.delete();
-				throw failure;
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	protected IArchiveSaveAdapter createSaveAdapterForJar(java.io.File aFile) throws java.io.IOException {
-		if (aFile.exists() && aFile.isDirectory()) {
-			throw new IOException(NLS.bind(CommonArchiveResourceHandler.ArchiveFactoryImpl_The_specified_file_0_exists_and_, aFile.getAbsolutePath()));
-		}
-		java.io.File parent = aFile.getParentFile();
-		if (parent != null)
-			parent.mkdirs();
-		java.io.OutputStream out = new java.io.FileOutputStream(aFile);
-		return new ZipStreamArchiveSaveAdapterImpl(out);
-	}
-
-	protected void save(IArchiveSaveAdapter anAdapter, IProgressMonitor monitor) throws ArchiveSaveFailureException {
-		try {
-			anAdapter.save(monitor);
-		} finally {
-			try {
-				anAdapter.close();
-			} catch (IOException e) {
-				throw new ArchiveSaveFailureException(e);
-			}
-		}
-	}
-
-	public void saveArchive(IArchive archive, ArchiveOptions archiveOptions, IProgressMonitor monitor) throws ArchiveSaveFailureException {
-		final int SAVE_TICKS = 198;
-		final int CLOSE_TICKS = 2;
-		final int TOTAL_TICKS = SAVE_TICKS + CLOSE_TICKS;
-		try {
-			monitor.beginTask(CommonArchiveResourceHandler.ArchiveFactoryImpl_Saving_archiv_, TOTAL_TICKS);
-			IArchiveSaveAdapter aSaveAdapter = (IArchiveSaveAdapter) archiveOptions.getOption(ArchiveOptions.SAVE_ADAPTER);
-			try {
-				aSaveAdapter.setArchive(archive);
-				save(aSaveAdapter, new SubProgressMonitor(monitor, SAVE_TICKS));
-
-				aSaveAdapter.close();
-				monitor.worked(CLOSE_TICKS);
-			} catch (ArchiveSaveFailureException failure) {
-				try {
-					if (aSaveAdapter != null)
-						aSaveAdapter.close();
-				} catch (IOException weTried) {
-					// Ignore
-				}
-				throw failure;
-			} catch (java.io.IOException ex) {
-				throw new ArchiveSaveFailureException(NLS.bind(CommonArchiveResourceHandler.ArchiveFactoryImpl_Error_saving_archive_0_, archive));
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveImpl.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveImpl.java
deleted file mode 100644
index f2c4b0f19..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveImpl.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jee.archive.AbstractArchiveLoadAdapter;
-import org.eclipse.jst.jee.archive.ArchiveModelLoadException;
-import org.eclipse.jst.jee.archive.ArchiveOpenFailureException;
-import org.eclipse.jst.jee.archive.ArchiveOptions;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveFactory;
-import org.eclipse.jst.jee.archive.IArchiveLoadAdapter;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.osgi.util.NLS;
-
-public class ArchiveImpl extends ArchiveResourceImpl implements IArchive {
-
-	private ArchiveOptions archiveOptions;
-
-	private IArchiveLoadAdapter loadAdapter;
-
-	private class ArchiveFileIndex {
-		private Map<IPath, IArchiveResource> index = new HashMap<IPath, IArchiveResource>();
-
-		private List<IArchive> nestedArchives = null;
-
-		private List<IArchiveResource> fullIndex = null;
-
-		private boolean fullyIndexed = false;
-
-		public ArchiveFileIndex() {
-		}
-
-		public synchronized List<IArchive> getNestedArchives() {
-			if (nestedArchives == null) {
-				nestedArchives = new ArrayList<IArchive>();
-			}
-			return nestedArchives;
-		}
-
-		public synchronized boolean containsFile(IPath archiveRelativePath) {
-			AbstractArchiveLoadAdapter.verifyRelative(archiveRelativePath);
-			return index.containsKey(archiveRelativePath);
-		}
-
-		public synchronized IArchiveResource getFile(IPath archiveRelativePath) {
-			AbstractArchiveLoadAdapter.verifyRelative(archiveRelativePath);
-			IArchiveResource aFile = index.get(archiveRelativePath);
-			return aFile;
-		}
-
-		public synchronized void noteEmptyFile(IPath archiveRelativePath) {
-			verifyNotFullyIndexed();
-			AbstractArchiveLoadAdapter.verifyRelative(archiveRelativePath);
-			index.put(archiveRelativePath, null);
-		}
-
-		public synchronized void addFile(IArchiveResource aFile) {
-			verifyNotFullyIndexed();
-			AbstractArchiveLoadAdapter.verifyRelative(aFile.getPath());
-			index.put(aFile.getPath(), aFile);
-		}
-
-		public synchronized boolean isFullyIndexed() {
-			return fullyIndexed;
-		}
-
-		public void fullyIndex(List<IArchiveResource> files) {
-			synchronized (this) {
-				if (fullyIndexed) {
-					verifyNotFullyIndexed();
-				}
-				fullyIndexed = true;
-			}
-
-			for (IArchiveResource aFile : files) {
-				AbstractArchiveLoadAdapter.verifyRelative(aFile.getPath());
-				synchronized (this) {
-					if (!index.containsKey(aFile.getPath())) {
-						index.put(aFile.getPath(), aFile);
-					}
-				}
-			}
-		}
-
-		public synchronized List<IArchiveResource> getFullIndex() {
-			if (!isFullyIndexed()) {
-				throw new RuntimeException("File list has not been fully indexed"); //$NON-NLS-1$
-			}
-			if (fullIndex == null) {
-				List<IArchiveResource> list = new ArrayList<IArchiveResource>();
-				list.addAll(index.values());
-				fullIndex = Collections.unmodifiableList(list);
-			}
-			return fullIndex;
-		}
-
-		private void verifyNotFullyIndexed() {
-			if (isFullyIndexed()) {
-				throw new RuntimeException("Attempting to modify a fully indexed file list"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private ArchiveFileIndex archiveFileIndex = new ArchiveFileIndex();
-
-	private FailedToCloseException openendBy = null;
-
-	public ArchiveImpl(ArchiveOptions archiveOptions) {
-		setType(IArchiveResource.ARCHIVE_TYPE);
-		setArchiveOptions(archiveOptions);
-		loadAdapter = (IArchiveLoadAdapter) getArchiveOptions().getOption(ArchiveOptions.LOAD_ADAPTER);
-		loadAdapter.setArchive(this);
-		openendBy = new FailedToCloseException();
-	}
-
-	public boolean isOpen() {
-		return openendBy != null;
-	}
-
-	public void close() {
-		if(isOpen()){
-			openendBy = null;
-			for (IArchive nestedArchive : getNestedArchives()) {
-				IArchiveFactory.INSTANCE.closeArchive(nestedArchive);
-			}
-			loadAdapter.close();
-			dispose();
-		}
-	}
-
-	@Override
-	protected void dispose() {
-		super.dispose();
-		archiveFileIndex = null;
-		loadAdapter = null;
-		archiveFactory = null;
-		archiveOptions = null;
-	}
-
-	public IArchiveResource getArchiveResource(IPath archiveRelativePath) throws FileNotFoundException {
-		AbstractArchiveLoadAdapter.verifyRelative(archiveRelativePath);
-		IArchiveResource aFile = null;
-		if (archiveFileIndex.containsFile(archiveRelativePath)) {
-			aFile = archiveFileIndex.getFile(archiveRelativePath);
-		} else if (!archiveFileIndex.isFullyIndexed()) {
-			aFile = loadAdapter.getArchiveResource(archiveRelativePath);
-			if (aFile == null) {
-				archiveFileIndex.noteEmptyFile(archiveRelativePath);
-			} else {
-				archiveFileIndex.addFile(aFile);
-			}
-		}
-		if(aFile == null){
-			throw new FileNotFoundException(NLS.bind(CommonArchiveResourceHandler.ArchiveImpl_0_in_1_, new Object[] { archiveRelativePath.toString(), toString() }));
-		}
-		return aFile;
-	}
-
-	public List<IArchiveResource> getArchiveResources() {
-		synchronized (this) {
-			if (!archiveFileIndex.isFullyIndexed()) {
-				archiveFileIndex.fullyIndex(loadAdapter.getArchiveResources());
-			}
-		}
-		return archiveFileIndex.getFullIndex();
-	}
-
-	public void setLoadAdapter(IArchiveLoadAdapter loadAdapter) {
-		this.loadAdapter = loadAdapter;
-	}
-	
-	public IArchiveLoadAdapter getLoadAdapter() {
-		return loadAdapter;
-	}
-
-	protected void setArchiveOptions(ArchiveOptions archiveOptions) {
-		this.archiveOptions = archiveOptions;
-	}
-
-	public ArchiveOptions getArchiveOptions() {
-		return archiveOptions;
-	}
-
-	@Override
-	public String toString() {
-		return loadAdapter.toString();
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		super.finalize();
-		if (isOpen()) {
-			System.err.println("Archive opener did not close archive: " + this); //$NON-NLS-1$
-			System.err.println("Archive was opened here:"); //$NON-NLS-1$
-			openendBy.printStackTrace(System.err);
-			close();
-		}
-	}
-
-	public boolean containsModelObject() {
-		return containsModelObject(IArchive.EMPTY_MODEL_PATH);
-	}
-
-	public boolean containsModelObject(IPath modelObjectPath) {
-		AbstractArchiveLoadAdapter.verifyRelative(modelObjectPath);
-		return getLoadAdapter().containsModelObject(modelObjectPath);
-	}
-
-	public Object getModelObject() throws ArchiveModelLoadException {
-		return getModelObject(IArchive.EMPTY_MODEL_PATH);
-	}
-
-	public Object getModelObject(IPath modelObjectPath) throws ArchiveModelLoadException {
-		AbstractArchiveLoadAdapter.verifyRelative(modelObjectPath);
-		return getLoadAdapter().getModelObject(modelObjectPath);
-	}
-
-	public boolean containsArchiveResource(IPath archiveRelativePath) {
-		AbstractArchiveLoadAdapter.verifyRelative(archiveRelativePath);
-		if (archiveFileIndex.containsFile(archiveRelativePath)) {
-			return true;
-		} else if (!archiveFileIndex.isFullyIndexed()) {
-			return loadAdapter.containsArchiveResource(archiveRelativePath);
-		}
-		return false;
-	}
-
-	public IArchive getNestedArchive(IArchiveResource archiveResource) throws ArchiveOpenFailureException {
-		try {
-			if (archiveResource.getArchive() != this) {
-				throw new ArchiveOpenFailureException("Attempted to open nested IArchive " + archiveResource.getPath() + " using an IArchiveResource not contained in this IArchive."); //$NON-NLS-1$//$NON-NLS-2$
-			}
-			getArchiveResources(); // need to force the full index to be built now.
-			IArchiveResource cachedArchiveResource = getArchiveResource(archiveResource.getPath());
-
-			if (cachedArchiveResource.getType() == IArchiveResource.ARCHIVE_TYPE) {
-				IArchive nestedArchive = (IArchive) cachedArchiveResource;
-				if (!archiveFileIndex.getNestedArchives().contains(nestedArchive)) {
-					archiveFileIndex.getNestedArchives().add(nestedArchive);
-				}
-				return nestedArchive;
-			} else if (cachedArchiveResource.getType() == IArchiveResource.DIRECTORY_TYPE) {
-				throw new ArchiveOpenFailureException("Attempted to open nested IArchive " + cachedArchiveResource.getPath() + " using a directory."); //$NON-NLS-1$//$NON-NLS-2$
-			}
-			IArchiveLoadAdapter nestedLoadAdapter = null;
-
-			try {
-				java.io.File tempFile = null;
-				try {
-					tempFile = ArchiveUtil.createTempFile(cachedArchiveResource.getPath().toString());
-				} catch (IOException e) {
-					ArchiveUtil.warn("Warning: Unable to create temp file for " + cachedArchiveResource.getPath() + ".  This will impact performance."); //$NON-NLS-1$//$NON-NLS-2$
-				}
-				if (tempFile != null) {
-					InputStream in = cachedArchiveResource.getInputStream();
-					OutputStream out = new FileOutputStream(tempFile);
-					ArchiveUtil.copy(in, out);
-					nestedLoadAdapter = new TempZipFileArchiveLoadAdapterImpl(tempFile);
-				}
-			} catch (IOException e) {
-				throw new ArchiveOpenFailureException(e);
-			}
-
-			if (nestedLoadAdapter == null) {
-				// TODO implement a ZipStream reader if necessary
-			}
-
-			ArchiveOptions nestedArchiveOptions = cloneUnknownOptions(archiveOptions);
-			nestedArchiveOptions.setOption(ArchiveOptions.PARENT_ARCHIVE, this);
-			nestedArchiveOptions.setOption(ArchiveOptions.LOAD_ADAPTER, nestedLoadAdapter);
-			nestedArchiveOptions.setOption(ArchiveOptions.ARCHIVE_PATH, cachedArchiveResource.getPath());
-			IArchive nestedArchive = archiveFactory.openArchive(nestedArchiveOptions);
-			nestedArchive.setPath(cachedArchiveResource.getPath());
-			nestedArchive.setArchive(this);
-			return nestedArchive;
-
-		} catch (FileNotFoundException e) {
-			throw new ArchiveOpenFailureException(e);
-		}
-	}
-
-	protected ArchiveOptions cloneUnknownOptions(ArchiveOptions archiveOptions){
-		ArchiveOptions newOptions = new ArchiveOptions();
-		Iterator iterator = archiveOptions.keySet().iterator();
-		while(iterator.hasNext()){
-			Object key = iterator.next();
-			if(key == ArchiveOptions.ARCHIVE_PATH || key == ArchiveOptions.LOAD_ADAPTER || key == ArchiveOptions.SAVE_ADAPTER){
-				continue;
-			} else {
-				newOptions.setOption(key, archiveOptions.getOption(key));
-			}
-		}
-		return newOptions;
-	}
-	
-	
-	public List<IArchive> getNestedArchives() {
-		return Collections.unmodifiableList(archiveFileIndex.getNestedArchives());
-	}
-
-	/**
-	 * Internal
-	 * 
-	 * @param archiveResource
-	 */
-	void addArchiveResourceInternal(IArchiveResource archiveResource) {
-		archiveFileIndex.index.put(archiveResource.getPath(), archiveResource);
-		if(archiveResource.getType() == ARCHIVE_TYPE){
-			archiveFileIndex.getNestedArchives().add((IArchive)archiveResource);
-		}
-		archiveFileIndex.fullIndex = null;
-	}
-	
-	protected IArchiveFactory archiveFactory;
-	/**
-	 * Internal; clients should not call.
-	 * @param archiveFactory
-	 */
-	public void setArchiveFactory(IArchiveFactory archiveFactory){
-		this.archiveFactory = archiveFactory;
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveResourceImpl.java
deleted file mode 100644
index 6cae86071..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveResourceImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveLoadAdapter;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-
-public class ArchiveResourceImpl implements IArchiveResource {
-
-	private IArchive archive = null;
-
-	private int type = UNKNOWN_TYPE;
-
-	private long size = -1;
-
-	private long lastModified = -1;
-
-	private IPath path = null;
-
-	public IArchive getArchive() {
-		return archive;
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public long getLastModified() {
-		return lastModified;
-	}
-
-	public IPath getPath() {
-		return path;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public void setArchive(IArchive archive) {
-		this.archive = archive;
-		((ArchiveImpl)archive).addArchiveResourceInternal(this);
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public void setLastModified(long lastModified) {
-		this.lastModified = lastModified;
-	}
-
-	public void setPath(IPath path) {
-		this.path = path;
-	}
-
-	public void setSize(long size) {
-		this.size = size;
-	}
-
-	public InputStream getInputStream() throws FileNotFoundException, IOException {
-		switch (getType()) {
-		case IArchiveResource.DIRECTORY_TYPE:
-		case IArchiveResource.UNKNOWN_TYPE:
-			return null;
-		case IArchiveResource.FILE_TYPE:
-		case IArchiveResource.ARCHIVE_TYPE:
-			IArchiveLoadAdapter loadAdapter = null;
-			loadAdapter = getArchive().getLoadAdapter();
-			return loadAdapter.getInputStream(this);
-		}
-		return null;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		switch (getType()) {
-		case FILE_TYPE:
-			buffer.append("File: "); //$NON-NLS-1$
-			break;
-		case DIRECTORY_TYPE:
-			buffer.append("Directory: "); //$NON-NLS-1$
-			break;
-		case ARCHIVE_TYPE:
-			buffer.append("Archive: "); //$NON-NLS-1$
-			break;
-		case UNKNOWN_TYPE:
-			buffer.append("Unknown: "); //$NON-NLS-1$
-		}
-		buffer.append(getPath());
-		return buffer.toString();
-	}
-
-	protected void dispose() {
-		archive = null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveURIConverter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveURIConverter.java
deleted file mode 100644
index 2814ae17a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveURIConverter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-
-public class ArchiveURIConverter extends URIConverterImpl {
-
-	private IArchive archive = null;
-
-	public ArchiveURIConverter(IArchive archive) {
-		this.archive = archive;
-	}
-
-	public IArchive getArchive() {
-		return archive;
-	}
-
-	protected Map <URI, IPath> uriToPathMap = new HashMap <URI, IPath>();
-
-	protected Map <IPath, URI> pathToURIMap = new HashMap <IPath, URI>();
-
-	public final URI getURI(IPath path) {
-		if (!pathToURIMap.containsKey(path)) {
-			URI uri = convertPathToURI(path);
-			uriToPathMap.put(uri, path);
-			pathToURIMap.put(path, uri);
-			return uri;
-		} else {
-			return pathToURIMap.get(path);
-		}
-	}
-
-	protected URI convertPathToURI(IPath path) {
-		return URI.createURI(path.toString());
-	}
-
-	protected IPath convertURIToPath(URI uri) {
-		return new Path(uri.toString());
-	}
-
-	public final IPath getPath(URI uri) {
-		if (!uriToPathMap.containsKey(uri)) {
-			IPath path = convertURIToPath(uri);
-			uriToPathMap.put(uri, path);
-			pathToURIMap.put(path, uri);
-			return path;
-		} else {
-			return uriToPathMap.get(uri);
-		}
-	}
-
-	@Override
-	public InputStream createInputStream(URI uri) throws IOException {
-		IPath path = getPath(uri);
-		IArchiveResource archiveResource = getArchive().getArchiveResource(path);
-		return archiveResource.getInputStream();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveUtil.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveUtil.java
deleted file mode 100644
index 2d7fc76f9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ArchiveUtil.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.jst.common.internal.modulecore.util.ManifestUtilities;
-import org.eclipse.jst.jee.archive.ArchiveSaveFailureException;
-
-
-public class ArchiveUtil {
-	
-	protected static String tempDirectoryName;
-
-	protected static java.io.File tempDirectory;
-
-	/**
-	 * Returns the filename from the uri, or the segment after the last
-	 * occurrence of a separator
-	 */
-	public static String getFileNameTail(String uri) {
-		String tempURI = uri.replace('\\', '/');
-		while (tempURI.endsWith("/")) //$NON-NLS-1$
-			tempURI = tempURI.substring(0, tempURI.length() - 1);
-		int lastIndex = tempURI.lastIndexOf('/');
-		if (lastIndex == -1)
-			return uri;
-		return uri.substring(lastIndex + 1, tempURI.length());
-	}
-
-	public static java.io.File getTempDirectory() {
-		return tempDirectory;
-	}
-
-	public static java.io.File createTempFile(String baseName) throws IOException {
-		return createTempFile(baseName, getTempDirectory());
-	}
-
-	public static java.io.File createTempFile(String baseName, java.io.File directory) throws IOException {
-		String fileName = getFileNameTail(baseName);
-		if (fileName.length() < 3) {
-			fileName = "WSTMP" + fileName; //$NON-NLS-1$
-		}
-		java.io.File tempFile = java.io.File.createTempFile(fileName, null, directory);
-		DeleteOnExitUtility.markForDeletion(tempFile);
-		return tempFile;
-	}
-
-	/**
-	 * returns a list of all files, recursive, that can't be written
-	 */
-	public static List getWriteProtectedFiles(java.io.File aFile, List aList) {
-		if (aList == null)
-			aList = new ArrayList();
-		if (aFile.exists() && !aFile.canWrite())
-			aList.add(aFile);
-		if (aFile.isDirectory()) {
-			java.io.File[] files = aFile.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				getWriteProtectedFiles(files[i], aList);
-			}
-		}
-		return aList;
-	}
-
-	public static void checkWriteable(java.io.File aFile) throws ArchiveSaveFailureException {
-		List locked = ArchiveUtil.getWriteProtectedFiles(aFile, null);
-		if (locked.isEmpty())
-			return;
-
-		StringBuffer msg = new StringBuffer();
-		msg.append("Cannot write to file: "); //$NON-NLS-1$
-		msg.append(aFile.getAbsolutePath());
-		msg.append('\n');
-		msg.append("One or more files is write protected or locked:"); //$NON-NLS-1$
-		msg.append('\n');
-		for (int i = 0; i < locked.size(); i++) {
-			java.io.File lockedFile = (java.io.File) locked.get(i);
-			msg.append(lockedFile.getAbsolutePath());
-			msg.append('\n');
-		}
-		throw new ArchiveSaveFailureException(msg.toString());
-	}
-
-	/**
-	 * deletes a file from the file system; for directories, recurse the
-	 * subdirectories and delete them as well
-	 * 
-	 * @return true if successful; false if any file or sub file could not be
-	 *         deleted
-	 */
-	public static boolean delete(java.io.File aFile) {
-		if (aFile == null)
-			return true;
-		if (aFile.isDirectory()) {
-			java.io.File[] files = aFile.listFiles();
-			if (files != null) {
-				for (int i = 0; i < files.length; i++) {
-					if (!delete(files[i]))
-						return false;
-				}
-			}
-		}
-		return aFile.delete();
-	}
-
-	/**
-	 * If we can rename it then we can delete it
-	 */
-	public static boolean isRenameable(java.io.File orig) {
-		java.io.File origCopy1 = null;
-		java.io.File origCopy2 = null;
-		try {
-			origCopy1 = orig.getCanonicalFile();
-			origCopy2 = orig.getCanonicalFile();
-		} catch (java.io.IOException ex) {
-			return false;
-		}
-		String name = null;
-		String baseName = "save.tmp"; //$NON-NLS-1$
-		try {
-			if (orig.getParent() != null)
-				baseName = new java.io.File(orig.getParent(), baseName).getCanonicalPath();
-		} catch (java.io.IOException ex) {
-			return false;
-		}
-
-		java.io.File temp = null;
-		int index = 0;
-		do {
-			name = baseName + index;
-			temp = new java.io.File(name);
-			index++;
-		} while (temp.exists());
-		return origCopy1.renameTo(temp) && temp.renameTo(origCopy2);
-	}
-
-	public static void cleanupAfterTempSave(String aUri, java.io.File original, java.io.File destinationFile) throws ArchiveSaveFailureException {
-
-		checkWriteable(original);
-		boolean deleteWorked = false;
-		if (original.isDirectory() && !isRenameable(original)) {
-			// TODO throw new
-			// SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.unable_replace_EXC_,
-			// (new Object[]{original.getAbsolutePath()}))); // = "Unable to
-			// replace original archive "
-		}
-
-		for (int i = 0; i < 10; i++) {
-			if (ArchiveUtil.delete(original)) {
-				deleteWorked = true;
-				break;
-			}
-			try {
-				// TODO Major hack here; the problem is that a previous call
-				// to close the source file may not yet have
-				// been reflected in the os/vm; therefore a subsequent call
-				// to delete fails. To get around this,
-				// wait for a bit and retry; if it continues to fail, then
-				// time out and throw an exception
-				Thread.sleep(250);
-			} catch (InterruptedException e) {
-				// Ignore
-			}
-		}
-		if (deleteWorked) {
-			for (int i = 0; i < 10; i++) {
-				if (destinationFile.renameTo(original)){
-					DeleteOnExitUtility.fileHasBeenDeleted(destinationFile);
-					return;
-				}
-				try {
-					Thread.sleep(250);
-				} catch (InterruptedException e) {
-					// Ignore
-				}
-			}
-		}
-		// TODO throw new
-		// SaveFailureException(CommonArchiveResourceHandler.getString(CommonArchiveResourceHandler.unable_replace_EXC_,
-		// (new Object[]{original.getAbsolutePath()}))); // = "Unable to replace
-		// original archive "
-	}
-
-	/**
-	 * Copy all the data from the input stream to the output stream up until the
-	 * first end of file character, and close the two streams
-	 */
-	public static void copy(InputStream in, OutputStream out) throws IOException {
-		byte[] buffer = new byte[1024];
-		try {
-			int n = in.read(buffer);
-			while (n > 0) {
-				out.write(buffer, 0, n);
-				n = in.read(buffer);
-			}
-		} finally {
-			if (!(in instanceof ZipInputStream))
-				in.close();
-			if (!(out instanceof ZipOutputStream))
-				out.close();
-		}
-	}
-	
-	public static void warn(Throwable e){
-		org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(e);
-	}
-	
-	public static void warn(String message) {
-		org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(message);
-	}
-	
-	public static ZipFile newZipFile(String fileName)throws ZipException, IOException {
-		return ArchiveUtil.newZipFile(new File(fileName), ZipFile.OPEN_READ);
-	}
-	public static ZipFile newZipFile(File aFile)throws ZipException, IOException {
-		return ArchiveUtil.newZipFile(aFile, ZipFile.OPEN_READ);
-	}
-	
-	/**
-	 * Utility to create ZipFiles which avoid memory leaks 
-	 * because closing them fails to close open inputstreams.
-	 * There is a SUN bug open for this: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6735255 
-     * but it looks like the "fix" will be to change the Javadoc :-(   
-	 * @param aFile mode
-	 * @return
-	 * @throws ZipException
-	 * @throws IOException
-	 */
-	public static ZipFile newZipFile(File aFile, int mode) throws ZipException, IOException {
-		return ManifestUtilities.newZipFile(aFile, mode);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/DeleteOnExitUtility.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/DeleteOnExitUtility.java
deleted file mode 100644
index 3b7fef37a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/DeleteOnExitUtility.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-
-/**
- * @author jsholl
- */
-public class DeleteOnExitUtility {
-
-	private static Set tempFilesToDelete;
-	private static boolean initialized = false;
-	private static int cleanupCount = 0;
-	private static final int CLEANUP_THRESHOLD = 10000;
-
-	public static void markForDeletion(File file) {
-		if (!initialized) {
-			initialized = true;
-			try {
-				Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-					public void run() {
-						if (tempFilesToDelete != null) {
-							synchronized (tempFilesToDelete) {
-								Iterator iterator = tempFilesToDelete.iterator();
-								File file = null;
-								while (iterator.hasNext()) {
-									try {
-										file = (File) iterator.next();
-										if (file.exists()) {
-											file.delete();
-										}
-									} catch (SecurityException e) {
-									}
-								}
-							}
-						}
-					}
-				}));
-				tempFilesToDelete = new HashSet();
-			} catch (SecurityException e) {
-			}
-		}
-		if (tempFilesToDelete != null) {
-			synchronized (tempFilesToDelete) {
-				cleanupCount++;
-				tempFilesToDelete.add(file);
-			}
-			if (cleanupCount > CLEANUP_THRESHOLD) {
-				runCleanup();
-			}
-		}
-	}
-
-	public static void fileHasBeenDeleted(File file) {
-		if (tempFilesToDelete != null) {
-			synchronized (tempFilesToDelete) {
-				cleanupCount++;
-				try {
-					if (!file.exists()) {
-						tempFilesToDelete.remove(file);
-					}
-				} catch (SecurityException e) {
-				}
-			}
-			if (cleanupCount > CLEANUP_THRESHOLD) {
-				runCleanup();
-			}
-		}
-	}
-
-	public static void runCleanup() {
-		if (tempFilesToDelete != null) {
-			synchronized (tempFilesToDelete) {
-				cleanupCount = 0;
-				List filesToRemove = null;
-				Iterator iterator = tempFilesToDelete.iterator();
-				File file = null;
-				while (iterator.hasNext()) {
-					try {
-						file = (File) iterator.next();
-						if (!file.exists()) {
-							if (filesToRemove == null) {
-								filesToRemove = new ArrayList();
-							}
-							filesToRemove.add(file);
-						}
-					} catch (SecurityException e) {
-					}
-				}
-				if (filesToRemove != null) {
-					tempFilesToDelete.removeAll(filesToRemove);
-				}
-			}
-		}
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/FailedToCloseException.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/FailedToCloseException.java
deleted file mode 100644
index b69b7154f..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/FailedToCloseException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import org.eclipse.jst.jee.archive.ArchiveException;
-
-
-public class FailedToCloseException extends ArchiveException {
-
-	private static final long serialVersionUID = 4654681519708387658L;
-
-	public FailedToCloseException() {
-		super();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/TempZipFileArchiveLoadAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/TempZipFileArchiveLoadAdapterImpl.java
deleted file mode 100644
index dda07672a..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/TempZipFileArchiveLoadAdapterImpl.java
+++ /dev/null
@@ -1,50 +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.jst.jee.archive.internal;
-
-import java.io.File;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.DeleteOnExitUtility;
-
-
-/**
- * Used as an optimization for reading jars within jars. Reading from a ZipFile is much faster than
- * from a ZipInputStream, therefore, when possible, it makes sense to copy the nested jar to a temp
- * file. It is the responsibility of the caller to ensure that the temp file gets deleted on normal
- * system exit, using the helper method on java.io.File. This adapter will also delete the file
- * when closed or finalized.
- */
-public class TempZipFileArchiveLoadAdapterImpl extends ZipFileArchiveLoadAdapterImpl {
-
-	protected File file;
-	
-	public TempZipFileArchiveLoadAdapterImpl() {
-		super();
-	}
-
-	public TempZipFileArchiveLoadAdapterImpl(java.io.File file) throws java.io.IOException {
-		super(ArchiveUtil.newZipFile(file));
-		this.file = file;
-	}
-	
-	public File getFile(){
-		return file;
-	}
-	
-	@Override
-	public void close() {
-		super.close();
-		File file = getFile();
-		file.delete();
-		DeleteOnExitUtility.fileHasBeenDeleted(file);
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ZipFileArchiveLoadAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ZipFileArchiveLoadAdapterImpl.java
deleted file mode 100644
index a679d2b23..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ZipFileArchiveLoadAdapterImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.archive.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.internal.modulecore.util.ManifestUtilities;
-import org.eclipse.jst.jee.archive.AbstractArchiveLoadAdapter;
-import org.eclipse.jst.jee.archive.ArchiveModelLoadException;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-
-
-
-public class ZipFileArchiveLoadAdapterImpl extends AbstractArchiveLoadAdapter {
-	protected ZipFile zipFile;
-
-	public ZipFileArchiveLoadAdapterImpl() {
-		super();
-	}
-
-	public ZipFileArchiveLoadAdapterImpl(ZipFile zipFile) {
-		super();
-		this.zipFile = zipFile;
-	}
-
-	@Override
-	public void close() {
-		super.close();
-		try {
-			getZipFile().close();
-		} catch (IOException e) {
-			// Ignore
-		}
-	}
-
-	@Override
-	public boolean containsArchiveResource(IPath resourcePath) {
-		ZipEntry entry = getZipFile().getEntry(resourcePath.toString());
-		return entry != null;
-	}
-	
-	@Override
-	public IArchiveResource getArchiveResource(IPath filePath) {
-		ZipEntry entry = getZipFile().getEntry(filePath.toString());
-		IArchiveResource aFile = null;
-		if (entry != null) {
-			aFile = createFile(entry);
-		}
-		return aFile;
-	}
-
-	@Override
-	public java.util.List getArchiveResources() {
-		List list = new ArrayList();
-		Enumeration entries = getZipFile().entries();
-		while (entries.hasMoreElements()) {
-			ZipEntry entry = (ZipEntry) entries.nextElement();
-			IArchiveResource aFile = createFile(entry);
-			list.add(aFile);
-		}
-		return list;
-	}
-
-	protected IArchiveResource createFile(ZipEntry entry) {
-		IPath path = new Path(entry.getName()).makeRelative();
-		IArchiveResource aFile = null;
-		if (!entry.isDirectory()) {
-			aFile = createFile(path);
-			aFile.setSize(entry.getSize());
-			aFile.setLastModified(entry.getTime());
-		} else { // always include directories
-			aFile = createDirectory(path);
-			aFile.setSize(entry.getSize());
-			aFile.setLastModified(entry.getTime());
-		}
-		return aFile;
-	}
-
-	@Override
-	public java.io.InputStream getInputStream(IArchiveResource aFile) throws IOException, FileNotFoundException {
-		IPath path = aFile.getPath();
-		String uri = path.toString();
-		return ManifestUtilities.getInputstreamForZipEntry(getZipFile(), uri);
-	}
-
-	public java.util.zip.ZipFile getZipFile() {
-		return zipFile;
-	}
-
-	public void setZipFile(java.util.zip.ZipFile newZipFile) {
-		zipFile = newZipFile;
-	}
-	
-	@Override
-	public String toString() {
-		return zipFile.getName();
-	}
-
-	@Override
-	public boolean containsModelObject(IPath modelObjectPath) {
-		return false;
-	}
-
-	@Override
-	public Object getModelObject(IPath modelObjectPath) throws ArchiveModelLoadException {
-		throw new ArchiveModelLoadException("Simple Zip Archives have no model objects."); //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ZipStreamArchiveSaveAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ZipStreamArchiveSaveAdapterImpl.java
deleted file mode 100644
index 4a0e7f15d..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/internal/ZipStreamArchiveSaveAdapterImpl.java
+++ /dev/null
@@ -1,121 +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.jst.jee.archive.internal;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.jee.archive.AbstractArchiveSaveAdapter;
-import org.eclipse.jst.jee.archive.ArchiveSaveFailureException;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-import org.eclipse.jst.jee.archive.IArchiveSaveAdapter;
-
-
-
-/**
- * This is a concrete implentation of IArchiveSaveAdapter. All the contents of the archive, including xmi
- * resources, will be output to a ZipOutputStream. The output stream should be passed in by the
- * client.
- */
-public class ZipStreamArchiveSaveAdapterImpl extends AbstractArchiveSaveAdapter {
-	protected OutputStream destinationStream;
-	/** Used internally */
-	protected ZipOutputStream zipOutputStream;
-
-	/**
-	 * Wraps a new zip output stream around the parameter
-	 */
-	public ZipStreamArchiveSaveAdapterImpl(OutputStream out) {
-		setDestinationStream(out);
-		setZipOutputStream(new ZipOutputStream(out));
-	}
-
-	@Override
-	public void close() throws IOException {
-		getDestinationStream().close();
-	}
-
-	protected IArchiveSaveAdapter createNestedSaveAdapter(IArchive anArchive) {
-		return new ZipStreamArchiveSaveAdapterImpl(getZipOutputStream());
-	}
-
-	@Override
-	public void finish() throws IOException {
-		getZipOutputStream().finish();
-		//If this is not nested, close the stream to free up the resource
-		//otherwise, don't close it because the parent may not be done
-		if (!(getDestinationStream() instanceof ZipOutputStream))
-			getDestinationStream().close();
-	}
-
-	/**
-	 * @return java.io.OutputStream
-	 */
-	public java.io.OutputStream getDestinationStream() {
-		return destinationStream;
-	}
-
-	protected java.io.OutputStream getOutputStreamForResource(Resource aResource) throws java.io.IOException {
-		return getZipOutputStream();
-	}
-
-	/**
-	 * @return java.util.zip.ZipOutputStream
-	 */
-	protected java.util.zip.ZipOutputStream getZipOutputStream() {
-		return zipOutputStream;
-	}
-
-	@Override
-	protected void save(IArchiveResource resource) throws ArchiveSaveFailureException {
-		try {
-			IPath path = resource.getPath();
-			if(resource.getType() == IArchiveResource.DIRECTORY_TYPE && !path.hasTrailingSeparator()){
-				path = path.addTrailingSeparator();
-			}
-			
-			ZipEntry entry = new ZipEntry(path.toString());
-			if (resource.getLastModified() > 0)
-				entry.setTime(resource.getLastModified());
-			getZipOutputStream().putNextEntry(entry);
-			if (resource.getType() != IArchiveResource.DIRECTORY_TYPE) {
-				ArchiveUtil.copy(resource.getInputStream(), getZipOutputStream());
-			}
-			getZipOutputStream().closeEntry();
-		} catch (IOException e) {
-			throw new ArchiveSaveFailureException(e);
-		}
-	}
-
-	/**
-	 * @param newDestinationStream
-	 *            java.io.OutputStream
-	 */
-	public void setDestinationStream(java.io.OutputStream newDestinationStream) {
-		destinationStream = newDestinationStream;
-	}
-
-	/**
-	 * @param newZipOutputStream
-	 *            java.util.zip.ZipOutputStream
-	 */
-	protected void setZipOutputStream(java.util.zip.ZipOutputStream newZipOutputStream) {
-		zipOutputStream = newZipOutputStream;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
deleted file mode 100644
index 6a7b59836..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.util.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.xml.sax.InputSource;
-
-/**
- * A Utility for quickly determining the type and version of a Java EE
- * deployment descriptor.
- * 
- * @author jasholl
- * 
- */
-public class JavaEEQuickPeek implements J2EEVersionConstants {
-
-	private static final int UNSET = -2;
-
-	private XMLRootHandler handler = null;
-
-	public JavaEEQuickPeek(int type, int version) {
-		this(type, version, UNSET);
-	}
-
-	public JavaEEQuickPeek(int type, int version, int javaEEVersion) {
-		if (type == UNKNOWN) {
-			throw new RuntimeException("type must not be UNKNOWN"); //$NON-NLS-1$
-		} else if (version == UNKNOWN) {
-			throw new RuntimeException("version must not be UNKNONW"); //$NON-NLS-1$
-		} else if (javaEEVersion == UNKNOWN) {
-			throw new RuntimeException("javaEEVersion must not be UNKNONW"); //$NON-NLS-1$
-		}
-		this.type = type;
-		this.version = version;
-		this.javaEEVersion = javaEEVersion;
-	}
-
-	public JavaEEQuickPeek(InputStream in) {
-		if (in != null) {
-			try {
-				InputSource inputSource = new InputSource(in);
-				handler = new XMLRootHandler();
-				handler.parseContents(inputSource);
-			} catch (Exception ex) {
-				// ignore
-			} finally {
-				try {
-					in.reset();
-				} catch (IOException ex) {
-					// ignore
-				}
-			}
-		} else {
-			version = UNKNOWN;
-			javaEEVersion = UNKNOWN;
-			type = UNKNOWN;
-		}
-	}
-
-	private int version = UNSET;
-
-	private int javaEEVersion = UNSET;
-
-	private int type = UNSET;
-
-	/**
-	 * Returns the deployment descriptor type as defined by one of
-	 * {@link J2EEVersionConstants#UNKNOWN},
-	 * {@link J2EEVersionConstants#APPLICATION_CLIENT_TYPE},
-	 * {@link J2EEVersionConstants#APPLICATION_TYPE},
-	 * {@link J2EEVersionConstants#EJB_TYPE},
-	 * {@link J2EEVersionConstants#CONNECTOR_TYPE},
-	 * {@link J2EEVersionConstants#WEB_TYPE},
-	 * {@link J2EEVersionConstants#WEBSERVICES_TYPE}
-	 * {@link J2EEVersionConstants#WEBFRAGMENT_TYPE}
-	 * 
-	 * @return
-	 */
-	public int getType() {
-		if (type == UNSET) {
-			String rootName = handler.getRootName();
-			if (rootName == null) {
-				type = UNKNOWN;
-			} else if (rootName.equals(J2EEConstants.APP_CLIENT_DOCTYPE)) {
-				type = APPLICATION_CLIENT_TYPE;
-			} else if (rootName.equals(J2EEConstants.APPLICATION_DOCTYPE)) {
-				type = APPLICATION_TYPE;
-			} else if (rootName.equals(J2EEConstants.EJBJAR_DOCTYPE)) {
-				type = EJB_TYPE;
-			} else if (rootName.equals(J2EEConstants.CONNECTOR_DOCTYPE)) {
-				type = CONNECTOR_TYPE;
-			} else if (rootName.equals(J2EEConstants.WEBAPP_DOCTYPE)) {
-				type = WEB_TYPE;
-			} else if (rootName.equals(J2EEConstants.WEB_SERVICES_DOCTYPE)) {
-				type = WEBSERVICES_TYPE;
-			} else if (rootName.equals(J2EEConstants.WEBFRAGMENT_DOCTYPE)) {
-				type = WEBFRAGMENT_TYPE;
-			}
-			else {
-				type = UNKNOWN;
-			}
-		}
-		return type;
-	}
-
-	public static String normalizeSchemaLocation(String schemaLocation){
-		if(schemaLocation == null){
-			return null;
-		}
-		char [] oldChars = schemaLocation.toCharArray();
-		char [] newChars = new char[oldChars.length];
-		int newCharIndex = 0;
-		boolean onWhiteSpace = true;
-		boolean afterWhiteSpace = false;
-		for(int oldCharIndex=0; oldCharIndex<oldChars.length; oldCharIndex++){
-			afterWhiteSpace = onWhiteSpace;
-			onWhiteSpace = Character.isWhitespace(oldChars[oldCharIndex]);
-			boolean shouldSkip = onWhiteSpace && afterWhiteSpace;
-			if(!shouldSkip){
-				newChars[newCharIndex++] = onWhiteSpace ? ' ' : oldChars[oldCharIndex];
-			}
-			boolean atEnd = ((oldCharIndex + 1) == oldChars.length);
-			if(atEnd && onWhiteSpace){
-				while(newCharIndex > 0  && newChars[newCharIndex-1] == ' '){
-					newCharIndex --;
-				}
-			}
-		}
-		return new String(newChars, 0, newCharIndex);
-	}
-	
-	/**
-	 * Returns the module version for this deployment descriptor type. For
-	 * example, if this is a EJB 3.0 deployment descriptor, this returns the
-	 * constant for 3.0 as defined bye {@link J2EEVersionConstants}
-	 * 
-	 * @return
-	 */
-	public int getVersion() {
-		if (version == UNSET) {
-			String publicID = handler.getDtdPublicID();
-			String systemID = handler.getDtdSystemID();
-			String schemaName = null;
-			if (publicID == null || systemID == null) {
-				if (handler.getRootAttributes() != null) {
-					schemaName = normalizeSchemaLocation(handler.getRootAttributes().getValue("xsi:schemaLocation")); //$NON-NLS-1$
-				}
-				if (schemaName == null) {
-					version = UNKNOWN;
-					return version;
-				}
-			}
-			switch (getType()) {
-			case APPLICATION_CLIENT_TYPE:
-				if (publicID != null && systemID != null) {
-					if (publicID.equals(J2EEConstants.APP_CLIENT_PUBLICID_1_3)
-							&& (systemID.equals(J2EEConstants.APP_CLIENT_SYSTEMID_1_3) || systemID.equals(J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_3))) {
-						version = J2EEVersionConstants.J2EE_1_3_ID;
-					} else if (publicID.equals(J2EEConstants.APP_CLIENT_PUBLICID_1_2)
-							&& (systemID.equals(J2EEConstants.APP_CLIENT_SYSTEMID_1_2) || systemID.equals(J2EEConstants.APP_CLIENT_ALT_SYSTEMID_1_2))) {
-						version = J2EEVersionConstants.J2EE_1_2_ID;
-					}
-				} else if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_1_4)) {
-						version = J2EEVersionConstants.J2EE_1_4_ID;
-					} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_5)) {
-						version = J2EEVersionConstants.JEE_5_0_ID;
-					} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) {
-						version = J2EEVersionConstants.JEE_6_0_ID;
-					}
-				}
-				break;
-			case APPLICATION_TYPE:
-				if (publicID != null && systemID != null) {
-					if (publicID.equals(J2EEConstants.APPLICATION_PUBLICID_1_3)
-							&& (systemID.equals(J2EEConstants.APPLICATION_SYSTEMID_1_3) || systemID.equals(J2EEConstants.APPLICATION_ALT_SYSTEMID_1_3))) {
-						version = J2EEVersionConstants.J2EE_1_3_ID;
-					} else if (publicID.equals(J2EEConstants.APPLICATION_PUBLICID_1_2)
-							&& (systemID.equals(J2EEConstants.APPLICATION_SYSTEMID_1_2) || systemID.equals(J2EEConstants.APPLICATION_ALT_SYSTEMID_1_2))) {
-						version = J2EEVersionConstants.J2EE_1_2_ID;
-					}
-				} else if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_1_4)) {
-						version = J2EEVersionConstants.J2EE_1_4_ID;
-					} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_5)) {
-						version = J2EEVersionConstants.JEE_5_0_ID;
-					} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) {
-						version = J2EEVersionConstants.JEE_6_0_ID;
-					}
-				}
-				break;
-			case EJB_TYPE:
-				if (publicID != null && systemID != null) {
-					if (publicID.equals(J2EEConstants.EJBJAR_PUBLICID_2_0) && (systemID.equals(J2EEConstants.EJBJAR_SYSTEMID_2_0) || systemID.equals(J2EEConstants.EJBJAR_ALT_SYSTEMID_2_0))) {
-						version = J2EEVersionConstants.EJB_2_0_ID;
-					} else if (publicID.equals(J2EEConstants.EJBJAR_PUBLICID_1_1) && (systemID.equals(J2EEConstants.EJBJAR_SYSTEMID_1_1) || systemID.equals(J2EEConstants.EJBJAR_ALT_SYSTEMID_1_1))) {
-						version = J2EEVersionConstants.EJB_1_1_ID;
-					}
-				} else if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_2_1)) {
-						version = J2EEVersionConstants.EJB_2_1_ID;
-					} else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_0)) {
-						version = J2EEVersionConstants.EJB_3_0_ID;
-					} else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_1)) {
-						version = J2EEVersionConstants.EJB_3_1_ID;
-					}
-				}
-				break;
-			case CONNECTOR_TYPE:
-				if (publicID != null && systemID != null) {
-					if (publicID.equals(J2EEConstants.CONNECTOR_PUBLICID_1_0) && (systemID.equals(J2EEConstants.CONNECTOR_SYSTEMID_1_0) || systemID.equals(J2EEConstants.CONNECTOR_ALT_SYSTEMID_1_0))) {
-						version = J2EEVersionConstants.JCA_1_0_ID;
-					}
-				} else if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.CONNECTOR_SCHEMA_1_5)) {
-						version = J2EEVersionConstants.JCA_1_5_ID;
-					} else if (schemaName.equals(J2EEConstants.CONNECTOR_SCHEMA_1_6)) {
-						version = J2EEVersionConstants.JCA_1_6_ID;
-					}
-				}
-				break;
-			case WEB_TYPE:
-				if (publicID != null && systemID != null) {
-					if (publicID.equals(J2EEConstants.WEBAPP_PUBLICID_2_3) && (systemID.equals(J2EEConstants.WEBAPP_SYSTEMID_2_3) || systemID.equals(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_3))) {
-						version = J2EEVersionConstants.WEB_2_3_ID;
-					} else if (publicID.equals(J2EEConstants.WEBAPP_PUBLICID_2_2) && (systemID.equals(J2EEConstants.WEBAPP_SYSTEMID_2_2) || systemID.equals(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_2))) {
-						version = J2EEVersionConstants.WEB_2_2_ID;
-					}
-				} else if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_2_4)) {
-						version = J2EEVersionConstants.WEB_2_4_ID;
-					} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_2_5)) {
-						version = J2EEVersionConstants.WEB_2_5_ID;
-					} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) {
-						version = J2EEVersionConstants.WEB_3_0_ID;
-					}
-				}
-				break;
-			case WEBSERVICES_TYPE:
-				if (publicID != null && systemID != null) {
-					if (publicID.equals(J2EEConstants.WEBSERVICE_PUBLICID) && (systemID.equals(J2EEConstants.WEBSERVICE_SYSTEMID))) {
-						version = J2EEVersionConstants.WEBSERVICES_1_0_ID;
-					}
-				} else if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_1)) {
-						version = J2EEVersionConstants.WEBSERVICES_1_1_ID;
-					} else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_2)) {
-						version = J2EEVersionConstants.WEBSERVICES_1_2_ID;
-					}else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_3)) {
-						version = J2EEVersionConstants.WEBSERVICES_1_3_ID;
-					}
-				}
-				break;
-			case WEBFRAGMENT_TYPE:
-				if (schemaName != null) {
-					if (schemaName.equals(J2EEConstants.WEBFRAGMENT_SCHEMA_3_0)) {
-						version = J2EEVersionConstants.WEBFRAGMENT_3_0_ID;
-					}
-				}
-				break;
-			default:
-				break;
-			}
-			if (version == UNSET) {
-				version = UNKNOWN;
-			}
-		}
-		return version;
-	}
-
-	/**
-	 * Maps the version returned from {@link #getVersion()} to the Java EE spec
-	 * version. For example, this is an EJB 3.0 deployment descriptor, this
-	 * returns the constant for 5.0 (which maps to the Java EE spec version of
-	 * 5.0). as defined by {@link J2EEVersionConstants}
-	 * 
-	 * @return
-	 */
-	public int getJavaEEVersion() {
-		if (javaEEVersion == UNSET) {
-			int type = getType();
-			int version = getVersion();
-			switch (type) {
-			case APPLICATION_CLIENT_TYPE:
-			case APPLICATION_TYPE:
-				javaEEVersion = version;
-				break;
-			case EJB_TYPE:
-				switch (version) {
-				case J2EEVersionConstants.EJB_1_1_ID:
-					javaEEVersion = J2EEVersionConstants.J2EE_1_2_ID;
-					break;
-				case J2EEVersionConstants.EJB_2_0_ID:
-					javaEEVersion = J2EEVersionConstants.J2EE_1_3_ID;
-					break;
-				case J2EEVersionConstants.EJB_2_1_ID:
-					javaEEVersion = J2EEVersionConstants.J2EE_1_4_ID;
-					break;
-				case J2EEVersionConstants.EJB_3_0_ID:
-					javaEEVersion = J2EEConstants.JEE_5_0_ID;
-					break;
-				case J2EEVersionConstants.EJB_3_1_ID:
-					javaEEVersion = J2EEConstants.JEE_6_0_ID;
-					break;
-				}
-				break;
-			case CONNECTOR_TYPE:
-				switch (version) {
-				case J2EEVersionConstants.JCA_1_0_ID:
-					javaEEVersion = J2EEConstants.J2EE_1_3_ID;
-					break;
-				case J2EEVersionConstants.JCA_1_5_ID:
-					javaEEVersion = J2EEConstants.J2EE_1_4_ID;
-					break;
-				case J2EEVersionConstants.JCA_1_6_ID:
-					javaEEVersion = J2EEConstants.JEE_6_0_ID;
-					break;
-				}
-				break;
-			case WEB_TYPE:
-				switch (version) {
-				case J2EEVersionConstants.WEB_2_2_ID:
-					javaEEVersion = J2EEVersionConstants.J2EE_1_2_ID;
-					break;
-				case J2EEVersionConstants.WEB_2_3_ID:
-					javaEEVersion = J2EEVersionConstants.J2EE_1_3_ID;
-					break;
-				case J2EEVersionConstants.WEB_2_4_ID:
-					javaEEVersion = J2EEVersionConstants.J2EE_1_4_ID;
-					break;
-				case J2EEVersionConstants.WEB_2_5_ID:
-					javaEEVersion = J2EEVersionConstants.JEE_5_0_ID;
-					break;
-				case J2EEVersionConstants.WEB_3_0_ID:
-					javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;
-					break;
-				}
-				break;
-		case WEBSERVICES_TYPE:
-			switch (version) {
-			case J2EEVersionConstants.WEBSERVICES_1_0_ID:
-				javaEEVersion = J2EEVersionConstants.J2EE_1_3_ID;
-				break;
-			case J2EEVersionConstants.WEBSERVICES_1_1_ID:
-				javaEEVersion = J2EEVersionConstants.J2EE_1_4_ID;
-				break;
-			case J2EEVersionConstants.WEBSERVICES_1_2_ID:
-				javaEEVersion = J2EEVersionConstants.JEE_5_0_ID;
-				break;
-			case J2EEVersionConstants.WEBSERVICES_1_3_ID:
-				javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;
-			}
-			break;
-			
-		case WEBFRAGMENT_TYPE:
-			javaEEVersion = J2EEVersionConstants.WEBFRAGMENT_3_0_ID;
-		}
-			if (javaEEVersion == UNSET) {
-				javaEEVersion = UNKNOWN;
-			}
-		}
-		return javaEEVersion;
-	}
-
-	public void setVersion(int version) {
-		this.version = version;
-	}
-
-	public void setJavaEEVersion(int javaEEVersion) {
-		this.javaEEVersion = javaEEVersion;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/XMLRootHandler.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/XMLRootHandler.java
deleted file mode 100644
index dbcc3e77b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/XMLRootHandler.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.util.internal;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-public final class XMLRootHandler extends DefaultHandler implements LexicalHandler {
-	/**
-	 * An exception indicating that the parsing should stop. This is usually
-	 * triggered when the top-level element has been found.
-	 * 
-	 * @since 3.0
-	 */
-	private class StopParsingException extends SAXException {
-		/**
-		 * All serializable objects should have a stable serialVersionUID
-		 */
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * Constructs an instance of <code>StopParsingException</code> with a
-		 * <code>null</code> detail message.
-		 */
-		public StopParsingException() {
-			super((String) null);
-		}
-	}
-
-	private String dtdName = null;
-
-	private String dtdPublicID = null;
-
-	private String dtdSystemID = null;
-
-	/**
-	 * This is the name of the top-level element found in the XML file. This
-	 * member variable is <code>null</code> unless the file has been parsed
-	 * successful to the point of finding the top-level element.
-	 */
-	private String elementFound = null;
-
-	/**
-	 * These are the attributes of the top-level element found in the XML file.
-	 * This member variable is <code>null</code> unless the file has been
-	 * parsed successful to the point of finding the top-level element.
-	 */
-	private Attributes attributesFound = null;
-
-	public String getDtdName() {
-		return dtdName;
-	}
-
-	public String getDtdPublicID() {
-		return dtdPublicID;
-	}
-
-	public String getDtdSystemID() {
-		return dtdSystemID;
-	}
-
-	public String getRootName() {
-		return elementFound;
-	}
-
-	public Attributes getRootAttributes() {
-		return attributesFound;
-	}
-
-	public XMLRootHandler() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-	 */
-	public final void comment(final char[] ch, final int start, final int length) {
-		// Not interested.
-	}
-
-	/**
-	 * Creates a new SAX parser for use within this instance.
-	 * 
-	 * @return The newly created parser.
-	 * 
-	 * @throws ParserConfigurationException
-	 *             If a parser of the given configuration cannot be created.
-	 * @throws SAXException
-	 *             If something in general goes wrong when creating the parser.
-	 * @throws SAXNotRecognizedException
-	 *             If the <code>XMLReader</code> does not recognize the
-	 *             lexical handler configuration option.
-	 * @throws SAXNotSupportedException
-	 *             If the <code>XMLReader</code> does not support the lexical
-	 *             handler configuration option.
-	 */
-	private final SAXParser createParser(SAXParserFactory parserFactory) throws ParserConfigurationException, SAXException, SAXNotRecognizedException, SAXNotSupportedException {
-		// Initialize the parser.
-		final SAXParser parser = parserFactory.newSAXParser();
-		final XMLReader reader = parser.getXMLReader();
-		reader.setProperty("http://xml.org/sax/properties/lexical-handler", this); //$NON-NLS-1$
-		// disable DTD validation (bug 63625)
-		try {
-			// be sure validation is "off" or the feature to ignore DTD's will
-			// not apply
-			reader.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
-			reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
-		} catch (SAXNotRecognizedException e) {
-			// not a big deal if the parser does not recognize the features
-		} catch (SAXNotSupportedException e) {
-			// not a big deal if the parser does not support the features
-		}
-		return parser;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endCDATA()
-	 */
-	public final void endCDATA() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endDTD()
-	 */
-	public final void endDTD() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-	 */
-	public final void endEntity(final String name) {
-		// Not interested.
-	}
-
-	public boolean parseContents(InputSource contents) throws IOException, ParserConfigurationException, SAXException {
-		// Parse the file into we have what we need (or an error occurs).
-		try {
-			SAXParserFactory factory = SAXParserFactory.newInstance();
-			if (factory == null)
-				return false;
-			final SAXParser parser = createParser(factory);
-			// to support external entities specified as relative URIs (see bug
-			// 63298)
-			contents.setSystemId("/"); //$NON-NLS-1$
-			parser.parse(contents, this);
-		} catch (StopParsingException e) {
-			// Abort the parsing normally. Fall through...
-		}
-		return true;
-	}
-
-	/*
-	 * Resolve external entity definitions to an empty string. This is to speed
-	 * up processing of files with external DTDs. Not resolving the contents of
-	 * the DTD is ok, as only the System ID of the DTD declaration is used.
-	 * 
-	 * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String,
-	 *      java.lang.String)
-	 */
-	@Override
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		return new InputSource(new StringReader("")); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-	 */
-	public final void startCDATA() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String,
-	 *      java.lang.String, java.lang.String)
-	 */
-	public final void startDTD(final String name, final String publicId, final String systemId) throws SAXException {
-		dtdName = name;
-		dtdPublicID = publicId;
-		dtdSystemID = systemId;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
-	 *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	@Override
-	public final void startElement(final String uri, final String elementName, final String qualifiedName, final Attributes attributes) throws SAXException {
-		elementFound = elementName == null || elementName.length() == 0 ? qualifiedName: elementName;
-		if(elementFound.indexOf(':') != -1){
-			elementFound = elementFound.substring(elementFound.indexOf(':')+1);
-		}
-		attributesFound = attributes;
-		throw new StopParsingException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-	 */
-	public final void startEntity(final String name) {
-		// Not interested.
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/build.properties b/plugins/org.eclipse.jst.j2ee.core/build.properties
deleted file mode 100644
index eef8198cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/build.properties
+++ /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
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               .,\
-               schema/
-src.includes = rose/,\
-               component.xml,\
-               model/
-jars.compile.order = .
-output.. = bin/
-source.. = mofj2ee/,\
-           webservices/,\
-           commonArchive/,\
-           j2eeCorePlugin/,\
-           j2ee-validation/,\
-           archive/,\
-           jee-models/
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties
deleted file mode 100644
index 2920bcfc9..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties
+++ /dev/null
@@ -1,102 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} must be implemented in subclass
-key_class_reflection_ERROR_=IWAE0002E Unable to reflect the class "{0}" in order to compare the primary key field "{1}" from entity "{2}"
-key_field_reflection_ERROR_=IWAE0003E Unable to reflect the type of the primary key field "{0}" from entity "{1}"
-removing_key_field_INFO_=IWAE0004I Removing invalid prim-key-field "{0}" from entity "{1}"
-repair_usage_ERROR_=IWAE0005E RepairArchiveCommand usage: cannot write to destinationPath: {0}
-invalid_archive_EXC_=IWAE0006E Archive is not a valid {0} because the deployment descriptor can not be found (case sensitive): {1}
-load_resource_EXC_=IWAE0007E Could not load resource "{0}" in archive "{1}"
-nested_jar_EXC_=IWAE0008E An error occurred reading {0} from {1}
-make_temp_dir_EXC_=IWAE0009E Unable to make temp directory: {0}
-invalid_classpath_WARN_=IWAE0010W Classpath element "{0}" is not a directory or a Zip file
-invalid_cp_file_WARN_=IWAE0011W Classpath element "{0}" does not point to a local file
-io_ex_loading_EXC_=IWAE0012E An IO exception occurred loading {0}
-tx_bean_mgd_WARN_=IWAE0013W EJB 1.0 Import: Not mapping TX_BEAN_MANAGED control descriptor for {0}
-error_saving_EXC_=IWAE0014E Error saving {0}
-io_ex_manifest_EXC_=IWAE0015E An IOException occurred reading the manifest in archive: {0}
-io_ex_reopen_EXC_=IWAE0016E IOException occurred while reopening {0}
-unable_replace_EXC_=IWAE0017E Unable to replace original archive: {0}
-duplicate_file_EXC_=IWAE0018E The archive named {0} already contains a file named {1}
-duplicate_entry_EXC_=IWAE0019E A file or resource with uri {0} already exists in the archive named {1}
-file_exist_as_dir_EXC_=IWAE0020E A file named {0} exists and is a directory
-uncontained_module_EXC_=IWAE0021E Module {0} is not contained by an EAR file
-dd_in_ear_load_EXC_=IWAE0022E Exception occurred loading deployment descriptor for module "{0}" in EAR file "{1}"
-nested_open_fail_EXC_=IWAE0023E Unable to open module file "{0}" in EAR file "{1}"
-duplicate_module_EXC_=IWAE0024E The deployment descriptor for the EAR file "{0}" already contains a module having uri "{1}"
-no_sec_role_EXC_=IWAE0025E {0}: EAR File deployment descriptor does not contain a security role named {1}
-dup_sec_role_EXC_=IWAE0026E {0}: EAR File deployment descriptor already contains a security role named {1}
-dup_sec_role_module_EXC_=IWAE0027E Deployment descriptor for {0} already contains a security role named {1}
-dup_resource_EXC_=IWAE0028E Resource named "{0}" already exists in archive "{1}"
-add_copy_class_dir_EXC_=IWAE0031E The method "addCopyClass" is not supported for directories. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E The method "addCopyLib" is not supported for directories. URI: {0}
-list_components_war_EXC_=IWAE0033E Exception occurred listing components in WAR file: {0}
-open_nested_EXC_=IWAE0034E Could not open the nested archive "{0}" in "{1}"
-make_temp_file_WARN_=IWAE0035W Warning: Unable to create temp file for {0}.  This will impact performance.
-file_not_found_EXC_=IWAE0036E URI Name: {0}; File name: {1}
-could_not_open_EXC_=IWAE0037E Could not open {0}
-could_not_find_dir_EXC_=IWAE0038E Unable to open directory {0}
-not_a_dir_EXC_=IWAE0039E Unable to open directory because file is not a directory: {0}
-inferred_dds_EXC_=IWAE0040E The EJB JAR file "{0}" was inferred to be of version 1.0 because the manifest does not declare enterprise beans but serialized deployment descriptors exist in the JAR.
-filename_exception_EXC_=IWAE0041E Filename: {0}; Exception: {1}
-no_dds_10_EXC_=IWAE0042E No deployment descriptors in EJB 1.0 JAR file: {0}
-manifest_dd_load_EXC_=IWAE0043E The JAR manifest declares an enterprise bean for which the deployment descriptor file can not be loaded: {0}
-manifest_dd_find_EXC_=IWAE0044E The JAR manifest declares an enterprise bean for which the deployment descriptor file can not be found: {0}
-io_ex_reading_dd_EXC_=IWAE0045E IO Exception occurred reading {0}
-ser_not_dd_EXC_=IWAE0046E The serialized object in file "{0}" is not a an instance of javax.ejb.deployment.DeploymentDescriptor
-reading_dd_EXC_=IWAE0047E Exception occurred reading {0}
-missing_class_EXC_=IWAE0048E Could not deserialize {0} because a required class could not be found.  Exception: {1}
-Converted=Converted
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Stack trace of nested exception:
-IOException_occurred_while_EXC_=IWAE0050E IOException occurred while copying manifest
-Extract_destination_is_the_EXC_=IWAE0051E Extract destination is the same path as source file
-Parameter_should_not_be_nu_EXC_=IWAE0052E Parameter should not be null
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E Archive is not a valid EJB JAR file (1.0) because no serialized deployment descriptors can be found, either in the manifest or in entries with a ".ser" extension
-_The_following_files_could_EXC_=IWAE0056E The following files could not be loaded:
-FixPrimKeyCommand_failed___EXC_=IWAE0057E FixPrimKeyCommand failed - exception stack trace:
-FixPrimKeyCommand_usage___=FixPrimKeyCommand usage:  <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E FixPrimKeyCommand usage: sourceJarFilePath must point to a valid EJB JAR file or directory of an inflated EJB JAR file
-Repair_command_failed___ex_EXC_=IWAE0059E Repair command failed - exception stack trace:
-Repairs_all_entries_in_the=Repairs all entries in the META-INF and/or WEB-INF directories to be the correct case
-RepairArchiveCommand_usage=RepairArchiveCommand usage:  <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E RepairArchiveCommand usage: sourceJarFilePath must point to a valid archive or directory of an inflated archive
-Application_Client_Jar_Fil=Application Client JAR File
-EAR_File=EAR File
-EJB_Jar_File=EJB JAR File
-RAR_File=RAR File
-WAR_File=WAR File
-Error_occurred_iterating_f_EXC_=IWAE0061E Error occurred iterating files
-End_of_list_reached_EXC_=IWAE0062E Reached end of list
-Internal_Error__Iterator_o_EXC_=IWAE0063E Internal Error: Iterator out of sync with zip entries
-Error_iterating_the_archiv_EXC_=IWAE0064E Error iterating the archive
-Absolute_path_unknown_EXC_=IWAE0065E Absolute path unknown
-Original_archive_is_not_a__EXC_=IWAE0066E Original archive is not a directory
-Null_uri_EXC_=IWAE0067E Null uri
-Module_file=Module file
-A_WAR_file=WAR file
-An_EJB_JAR_file=EJB JAR file
-An_Application_Client_JAR_file=Application Client JAR file
-A_RAR_file=RAR file
-A_Application_file=Application file
-A_file_does_not_exist_for_module=A file does not exist for module element having uri: {0}
-File_not_correct_type=The file {0} in EAR file {1} is not the correct type based on the application deployment descriptor.  Expected type: {2}";
-Module_not_in_EAR=Module is not in an EAR: {0}
-Module_file_does_not_exist_2=Module file does not exist for Module ref.  Module = {0}
-FileImpl__Error_0=Recursive containment not allowed for
-AbstractArchiveSaveAdapter_Saving_resource_=Saving resources
-AbstractArchiveSaveAdapter_Saving_resource_=Saving resources
-ArchiveFactoryImpl_Error_saving_archive_0_=Error saving archive: {0}
-ArchiveFactoryImpl_Error_saving_archive_0_to_output_=Error saving archive: {0} to output path: {1}
-ArchiveFactoryImpl_Saving_archiv_=Saving archive
-ArchiveFactoryImpl_Saving_archive_to_0_=Saving archive to: {0}
-ArchiveFactoryImpl_The_specified_file_0_exists_and_=The specified file: {0} exists and is a directory
-ArchiveImpl_0_in_1_={0} in {1}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ApplicationClientFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ApplicationClientFile.java
deleted file mode 100644
index 73b84984b..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ApplicationClientFile.java
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-
-
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-
-
-/**
- * @generated
- */
-public interface ApplicationClientFile extends ModuleFile {
-
-	/**
-	 * @throws DeploymentDescriptorLoadException -
-	 *             is a runtime exception, because we can't override the signature of the generated
-	 *             methods
-	 */
-
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The DeploymentDescriptor reference
-	 */
-	ApplicationClient getDeploymentDescriptor() throws DeploymentDescriptorLoadException;
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param l
-	 *            The new value of the DeploymentDescriptor reference
-	 */
-	void setDeploymentDescriptor(ApplicationClient value);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java
deleted file mode 100644
index 8192d266c..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java
+++ /dev/null
@@ -1,469 +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.jst.j2ee.commonarchivecore.internal;
-
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ReopenException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive;
-
-
-/**
- * @generated
- */
-public interface Archive extends Container {
-
-	public static final int EXPAND_NONE = 0;
-	public static final int EXPAND_WAR_FILES = 1 << 1;
-	public static final int EXPAND_EAR_FILES = 1 << 2;
-	public static final int EXPAND_EJBJAR_FILES = 1 << 3;
-	public static final int EXPAND_APPCLIENT_FILES = 1 << 4;
-	public static final int EXPAND_ARCHIVES = 1 << 5;
-	public static final int EXPAND_RAR_FILES = 1 << 6;
-	public static final int EXPAND_ALL = (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | (1 << 6);
-
-	public Archive addCopy(Archive anArchive) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	public File addCopy(File aFile) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	/**
-	 * Get a flattened list from the directory, then addCopy the list
-	 * 
-	 * @throws com.ibm.etools.archive.exception.DuplicateObjectException
-	 *             if a file with a uri that equals one of the nested files in the directory exists
-	 * 
-	 * @return java.util.List the copied files that were added to the archive
-	 */
-	public List addCopy(ReadOnlyDirectory dir) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	public List addCopyFiles(List listOfFiles) throws org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-
-	public void addOrReplaceMofResource(Resource aResource);
-
-	/**
-	 * @deprecated Use {@link #getDependentOpenArchives()}
-	 * 
-	 * If any opened archive contains files that have this archive as its loading container, return
-	 * false; otherwise return true. This method supports the following scenario: open jar A. create
-	 * jar B. Copy files from A to B. Attempt to close jar A before saving jar B. Then attempt to
-	 * save B, and the save fails because A is closed. This method allows client code to test for
-	 * dependent open archives before saving the source archive. If this method returns false, the
-	 * solution is to either close or save B before closing A.
-	 */
-	public boolean canClose();
-
-	/**
-	 * Closes the load strategy for this archive and closes all contained archives; WARNING: If
-	 * files have been copied from this archive to another archive, then the destination archive
-	 * should be saved or closed before this archive can be safely closed; to test if this archive
-	 * can safely close invoke {@link #canClose()}
-	 */
-	public void close();
-
-	/**
-	 * Save this archive as an expanded directory where the flags is the result of bitwise or of the
-	 * specified types to be expanded; example:
-	 * <code>anEarFile.saveAsDirectory(anEarFile.EXPAND_WAR_FILES | anEarFile.EXPAND_EJBJARFILES)</code>;
-	 * 
-	 * If this archive was loaded from the same uri as it is being extracted to, the orignal will be
-	 * deleted and replaced with the directory
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @throws ReopenException
-	 *             if an exception occurs while re-syncing the archive to the newly saved
-	 *             destination
-	 */
-	public void extract(int expansionFlags) throws SaveFailureException, ReopenException;
-
-	/**
-	 * For performance, save the archive without reopening; Further operations on this instance
-	 * without first calling {@link #reopen}will yield unexpected results.
-	 * 
-	 * @see #extract(int)
-	 */
-	public void extractNoReopen(int expansionFlags) throws SaveFailureException;
-
-	/**
-	 * Save this archive as a directory using the specified uri
-	 * 
-	 * The archive will not be renamed
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @see #extract(int)
-	 */
-	public void extractTo(String uri, int expansionFlags) throws SaveFailureException;
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.ClassLoader
-	 */
-	public java.lang.ClassLoader getArchiveClassLoader();
-
-	/**
-	 * Return a list of files in the ARchive that start with the prefix
-	 */
-	public java.util.List filterFilesByPrefix(String prefix);
-
-	/**
-	 * Return a list of files in the Archive excluding any file that starts with one of the prefixes
-	 */
-	public java.util.List filterFilesWithoutPrefix(String[] prefixes);
-
-	/**
-	 * Returns a filtered list of archive files; adds will not be reflected; use
-	 * 
-	 * @link Archive#add(File)
-	 */
-	public List getArchiveFiles();
-
-	public ResourceSet getResourceSet();
-
-	/**
-	 * Return a list of all root level (non-nested) opened archives containing files that have this
-	 * archive as its loading container; the set will be empty if no such opened archive exists.
-	 * This method supports the following scenario: open jar A. create jar B. Copy files from A to
-	 * B. Attempt to close jar A before saving jar B. Then attempt to save B, and the save fails
-	 * because A is closed. This method allows client code to test for dependent open archives
-	 * before saving the source archive. If the return value is not empty, the solution is to either
-	 * close or save B before closing A.
-	 */
-	public Set getDependentOpenArchives();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getExtraClasspath();
-
-	/**
-	 * Used internally by the framework, specifically as an optimization when saving/exploding
-	 * archives with nested archives
-	 */
-	public FileIterator getFilesForSave() throws IOException;
-
-	public Collection getLoadedMofResources();
-
-	public ArchiveManifest getManifest();
-
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException;
-
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions getOptions();
-
-	/**
-	 * @see LoadStrategy#getResourceInputStream(String)
-	 */
-	public InputStream getResourceInputStream(String uri) throws IOException;
-
-	/**
-	 * Used for websphere runtime where archives are on disk (not nested in jars)
-	 * 
-	 * @return list of absolute paths that represents this archive only, and in the case of
-	 *         WARFiles, the nested loadable contents.
-	 */
-	public RuntimeClasspathEntry[] getLocalRuntimeClassPath();
-
-	/**
-	 * Used for websphere runtime where archives are on disk (not nested in jars) to get the
-	 * recursive behavior, the Archive must belong to an EAR file
-	 * 
-	 * @return list of absolute paths that represents this archive, all it's prereqs, recursive.
-	 */
-	public RuntimeClasspathEntry[] getFullRuntimeClassPath();
-
-	/**
-	 * Used for websphere runtime where archives are on disk (not nested in jars) to get the
-	 * recursive behavior, the Archive must belong to an EAR file
-	 * 
-	 * @return list of absolute paths that represents the dependencies of this Archive, all it's
-	 *         prereqs, recursive.
-	 */
-	public RuntimeClasspathEntry[] getDependencyClassPath();
-
-	/**
-	 * Return the absolute path of the root from which meta resources get loaded
-	 */
-	public String getResourcesPath() throws FileNotFoundException;
-
-	/**
-	 * Return the absolute path of the root from which classes and properties are loaded
-	 */
-	public String getBinariesPath() throws FileNotFoundException;
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	public SaveFilter getSaveFilter();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return com.ibm.etools.archive.SaveStrategy
-	 */
-	public org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy getSaveStrategy();
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getXmlEncoding();
-
-	/**
-	 * Return whether this Archive has
-	 * 
-	 * @other on it's classpath, either directly or transitively
-	 * @param Archive
-	 *            other - another archive in the same EAR file
-	 */
-	public boolean hasClasspathVisibilityTo(Archive other);
-
-	/**
-	 * Internal API; Used for implementation of {@link #hasClasspathVisibilityTo(Archive)}
-	 * 
-	 * @param Archive
-	 *            other - another archive in the same EAR file
-	 * @param Set
-	 *            visited - the set of archives already visited
-	 */
-	public boolean hasClasspathVisibilityTo(Archive other, Set visited, EARFile ear);
-
-	/**
-	 * Perform any necessary initialization after the archive has been opened.
-	 */
-	public void initializeAfterOpen();
-
-	/**
-	 * Used internally by the load strategy
-	 */
-	public void initializeClassLoader();
-
-	/**
-	 * An item is considered a duplicate if the archive contains a file or loaded mof resource with
-	 * the uri, or if the uri is equal to the manifest uri
-	 */
-	public boolean isDuplicate(String uri);
-
-	/**
-	 * Used as an optimization at copy time
-	 */
-	public boolean isManifestSet();
-
-	public boolean isMofResourceLoaded(String uri);
-
-	/**
-	 * Used internally for dispatch between the archive and the load strategy when building the file
-	 * list; clients should not need to call this method.
-	 */
-	public boolean isNestedArchive(String uri);
-
-	/**
-	 * Indicates whether the archive is still opened for read; if not, IOExceptions could be thrown
-	 * on attempts to get input streams on file entries. reopen() will cause this archive and its
-	 * nested archives to rebuild their load strategies
-	 */
-	public boolean isOpen();
-
-	/**
-	 * Create a new mof resource and add it to the resource set of the context of this archive; all
-	 * resources in memory are saved when the archive is saved
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if a resource already exists in this archive having the uri
-	 */
-	public Resource makeMofResource(String uri) throws DuplicateObjectException;
-
-	/**
-	 * Create a new mof resource and add it to the resource set of the context of this archive; all
-	 * resources in memory are saved when the archive is saved
-	 * 
-	 * @throws DuplicateObjectException
-	 *             if a resource already exists in this archive having the uri
-	 */
-	public Resource makeMofResource(String uri, EList extent) throws DuplicateObjectException;
-
-	/**
-	 * Used internally for dispatch between the archive and the load strategy when building the file
-	 * list; clients should not need to call this method.
-	 */
-	public Archive openNestedArchive(String uri) throws OpenFailureException;
-
-	/**
-	 * Used internally for dispatch between the archive and the load strategy when building the file
-	 * list; clients should not need to call this method.
-	 */
-	public Archive openNestedArchive(LooseArchive loose) throws OpenFailureException;
-
-	/**
-	 * Set the value of the extra class path with no refresh of the class loader
-	 */
-	public void primSetExtraClasspath(java.lang.String newExtraClasspath);
-
-	public void remove(File aFile);
-
-	/**
-	 * Used internally for "re-syncing" an archive after save; clients normally should not need this
-	 * method
-	 */
-	public void reopen() throws ReopenException;
-
-	/**
-	 * Used internally for reopening nested archives; clients normally should not need this method
-	 */
-	public void reopen(Archive parent) throws ReopenException;
-
-	/**
-	 * Save this archive as a jar file with the uri of the archive;
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @throws ReopenException
-	 *             if an exception occurs while re-syncing the archive to the newly saved
-	 *             destination
-	 */
-	public void save() throws SaveFailureException, ReopenException;
-
-	/**
-	 * Save this archive using the save strategy specified
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 */
-	public void save(SaveStrategy aStrategy) throws SaveFailureException;
-
-	/**
-	 * Save this archive as a jar file using uri provided; If the uri is different than the URI of
-	 * this archive, the uri of this archive will change to the new uri (for reopen)
-	 * 
-	 * @throws SaveFailureException
-	 *             if an exception occurs while saving
-	 * 
-	 * @throws ReopenException
-	 *             if an exception occurs while re-syncing the archive to the newly saved
-	 *             destination
-	 */
-	public void saveAs(String uri) throws SaveFailureException, ReopenException;
-
-	/**
-	 * For performance, save the archive without reopening; Further operations on this instance
-	 * without first calling {@link #reopen}will yield unexpected results.
-	 * 
-	 * @see #saveAs(String)
-	 */
-	public void saveAsNoReopen(String uri) throws SaveFailureException;
-
-	/**
-	 * For performance, save the archive without reopening; Further operations on this instance
-	 * without first calling {@link #reopen}will yield unexpected results.
-	 * 
-	 * @see #save()
-	 */
-	public void saveNoReopen() throws SaveFailureException;
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newArchiveClassLoader
-	 *            java.lang.ClassLoader
-	 */
-	public void setArchiveClassLoader(java.lang.ClassLoader newArchiveClassLoader);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newExtraClasspath
-	 *            java.lang.String
-	 */
-	public void setExtraClasspath(java.lang.String newExtraClasspath);
-
-	public void setManifest(ArchiveManifest newManifest);
-
-	public void setManifest(java.util.jar.Manifest aManifest);
-
-	/**
-	 * Sets the Class-path manifest entry, rebuilds the class loader, and refreshes any reflected
-	 * java classes
-	 */
-	public void setManifestClassPathAndRefresh(String classpath);
-
-	public void setOptions(org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions newOptions);
-
-	/**
-	 * Optional filter for saving a subset of files; filter will be applied for all save and extract
-	 * invokations
-	 */
-	public void setSaveFilter(SaveFilter aFilter);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newSaveStrategy
-	 *            com.ibm.etools.archive.SaveStrategy
-	 */
-	public void setSaveStrategy(org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy newSaveStrategy);
-
-	/**
-	 * Insert the method's description here. Creation date: (11/29/00 6:35:08 PM)
-	 * 
-	 * @param newXmlEncoding
-	 *            java.lang.String
-	 */
-	public void setXmlEncoding(java.lang.String newXmlEncoding);
-
-	/**
-	 * Determine whether java reflection should be set up for this archive
-	 */
-	public boolean shouldUseJavaReflection();
-
-	/**
-	 * Returns the value of the '<em><b>Types</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Types</em>' attribute list isn't clear, there really should be
-	 * more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Types</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.commonarchivecore.CommonarchivePackage#getArchive_Types()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getTypes();
-
-	boolean isType(String type);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ArchiveTypeDiscriminatorRegistry.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ArchiveTypeDiscriminatorRegistry.java
deleted file mode 100644
index d0a763084..000000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ArchiveTypeDiscriminatorRegistry.java
+++ /dev/null
@@ -1,102 +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
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-
-
-/**
- * @author mdelder
- */
-public class ArchiveTypeDiscriminatorRegistry {
-
-	private Collection discriminators = null;
-	private Collection customTypes = null;
-
-	/*
-	 * Most known types are of length 3. Whenver a new type is added that is not of length 3,
-	 * modifications may be necessary to the 'isKnownArchiveType() method
-	 */
-	private static final String[] defaultKnownTypes = new String[]{"ear", "war", "jar", "zip", "far"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
-
-	public static final ArchiveTypeDiscriminatorRegistry INSTANCE = new ArchiveTypeDiscriminatorRegistry();
-
-	public static void registorDiscriminator(GenericArchiveTypeDiscriminator discriminator) {
-		INSTANCE.getDiscriminators().add(discriminator);
-		INSTANCE.addKnownArchiveTypes(discriminator.getCustomFileExtensions());
-	}
-
-	public static ArchiveTypeDiscriminatorRegistry getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * @return
-	 */
-	public Collection getDiscriminators() {
-		if (discriminators == null)
-			discriminators = new ArrayList();
-		return discriminators;
-	}
-
-	public void contributeTypes(Archive archive) {
-		if (discriminators == null)
-			return;
-		GenericArchiveTypeDiscriminator discriminator = null;
-		for (Iterator itr = discriminators.iterator(); itr.hasNext();) {
-			discriminator = (GenericArchiveTypeDiscriminator) itr.next();
-			if (discriminator.discriminate(archive))
-				archive.getTypes().add(discriminator.getTypeKey());
-		}
-	}
-
-	public void addKnownArchiveTypes(String[] newTypes) {
-		if (customTypes == null) {
-			customTypes = new ArrayList();
-		}
-		for (int i = 0; i < newTypes.length; i++) {
-			customTypes.add(newTypes[i]);
-		}
-	}
-
-	public boolean isKnownArchiveType(String fileURI) {
-		if (fileURI == null || fileURI.length() == 0)
-			return false;
-
-		String lowerCaseUri = fileURI.toLowerCase();
-		/*
-		 * Ensure that the length of the URI is long enough to contain a .3 style extension
-		 */
-		if (lowerCaseUri.length() > 4 && lowerCaseUri.charAt(lowerCaseUri.length() - 4) == '.') {
-			String ending = lowerCaseUri.substring(lowerCaseUri.length() - 3);
-			for (int i = 0; i < defaultKnownTypes.length; i++)
-				if (defaultKnownTypes[i].equals(ending))
-					return true;
-		}
-
-		String customType = null;
-		if (customTypes != null) {
-			Iterator customTypesIterator = customTypes.iterator();
-			while (customTypesIterator.hasNext()) {
-				customType = (String) customTypesIterator.next();
-				if (fileURI.endsWith(customType))
-					return true;
-			}
-		}
-
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ClientModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ClientModuleRef.java
deleted file mode 100644