1 files changed, 0 insertions, 31 deletions
diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b415c407f..000000000
--- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.tests
-Bundle-Version: 1.0.100
-Bundle-Activator: org.eclipse.wst.ws.tests.plugin.TestsPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.ws,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.jem.util,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws.ui,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.environment,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.ws.tests.data,
- org.eclipse.wst.ws.tests.plugin,
- org.eclipse.wst.ws.tests.unittest,
- org.eclipse.wst.ws.tests.util
-Bundle-ClassPath: tests.jar
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 c14487cea..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
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 b157d640f..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</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 f6c2bd02e..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Build" content="Build">
-   <title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<h2>org.eclipse.jst.enterprise_ui.feature</h2>
-
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=201942'>201942</a>. Web App Libraries container causes hang</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315'>204315</a>. Web Lib projects being added to the EAR</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=206478'>206478</a>. Importing a .war causes error</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=200193'>200193</a>. Cannot use Java project for BUJava</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=215537'>215537</a>. J2EEComponentProjectMigrator always adding WebAppLibrary classpath container</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=215538'>215538</a>. Several problems with J2EE and Web Dependencies properties pages</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=216779'>216779</a>. Unable to add specific project to web library</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=205126'>205126</a>. Java Utility jars containg wrong archive name</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 2c538add5..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Patch for org.eclipse.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/bugs/show_bug.cgi?id=201942 Web App Libraries container causes hang\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315 Web Lib projects being added to the EAR\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204833 deadlock caused by WebServiceViewerSynchronization\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=200193 Cannot use Java project for BUJava\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=215537 J2EEComponentProjectMigrator always adding WebAppLibrary classpath container\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=215538 Several problems with J2EE and Web Dependencies properties pages\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=216779 Unable to add specific project to web library\n\
-Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=205126 Java Utility jars containg wrong archive name\n\ 
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-September 27, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
deleted file mode 100644
index 3e49fa08d..000000000
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.enterprise_ui.feature.patch"
-      label="%featureName"
-      version="1.5.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jst.enterprise_ui.feature" version="1.5.5.v200707311635-pEBqMgr5s5Phpf6" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.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.j2ee.webservice.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.creation.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/plugins/org.eclipse.jst.j2ee.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ui/.classpath
deleted file mode 100644
index 3dce472cb..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="j2ee_ui"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.ui/.cvsignore
deleted file mode 100644
index 678089c03..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-doc
-temp.folder
-build.xml
-j2ee_ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.project b/plugins/org.eclipse.jst.j2ee.ui/.project
deleted file mode 100644
index 937fa4b6e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.etools.ctc.javaprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 04a5d483f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Jul 25 14:00:45 EDT 2007
-eclipse.preferences.version=1
-encoding//j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/earlibraries.properties=8859_1
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e2a8bcb0c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Thu May 10 18:35:45 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6cf957904..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 13 14:16:39 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index aa262e13e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,75 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true
-Bundle-Version: 1.1.201.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.jdt.internal.integration.ui;x-internal:=true,
- org.eclipse.jst.j2ee.internal;x-internal:=true,
- org.eclipse.jst.j2ee.internal.actions;x-internal:=true,
- org.eclipse.jst.j2ee.internal.classpathdep.ui,
- org.eclipse.jst.j2ee.internal.client.actions;x-internal:=true,
- org.eclipse.jst.j2ee.internal.command;x-internal:=true,
- org.eclipse.jst.j2ee.internal.deployables;x-internal:=true,
- org.eclipse.jst.j2ee.internal.dialogs;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ear.actions;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.listeners;x-internal:=true,
- org.eclipse.jst.j2ee.internal.perspective;x-internal:=true,
- org.eclipse.jst.j2ee.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ui;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ui.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.war.ui.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.wizard;x-internal:=true,
- org.eclipse.jst.j2ee.ui.archive,
- org.eclipse.jst.j2ee.ui.archive.internal,
- org.eclipse.jst.j2ee.ui.project.facet,
- org.eclipse.jst.j2ee.ui.project.facet.appclient
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ui/about.html b/plugins/org.eclipse.jst.j2ee.ui/about.html
deleted file mode 100644
index 2199df3f0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor�s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/build.properties b/plugins/org.eclipse.jst.j2ee.ui/build.properties
deleted file mode 100644
index 55ac8282a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               .,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-source.. = j2ee_ui/,\
-                     property_files/
-output.. = bin/
-src.includes = plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d4d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif
deleted file mode 100644
index 91e708f7c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 276842824..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif
deleted file mode 100644
index 3c455c9ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif
deleted file mode 100644
index a9063201b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif
deleted file mode 100644
index 788e76d4a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif
deleted file mode 100644
index 3e31054b1..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif
deleted file mode 100644
index 573b60f0c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif
deleted file mode 100644
index 20ed1f9a4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c65..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif
deleted file mode 100644
index 5df61935f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif
deleted file mode 100644
index 625e763c9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif
deleted file mode 100644
index 8b409b507..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif
deleted file mode 100644
index f52fa9702..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef01..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e59..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif
deleted file mode 100644
index c91b26723..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 182321138..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index db8945f83..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300c8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d54..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b1717..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417c4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4e8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859dd4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201bb5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48df..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2f7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c06679..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a13a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba83..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b507..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22bf9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be16..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif
deleted file mode 100644
index 8f943a8c3..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c42..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 928a0bf95..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index 965738888..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif
deleted file mode 100644
index 54b9b1745..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif
deleted file mode 100644
index 35835bc25..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif
deleted file mode 100644
index 673ba6aa6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif
deleted file mode 100644
index 9dae05280..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d54..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif
deleted file mode 100644
index b2483803b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif
deleted file mode 100644
index b0d08af9e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
deleted file mode 100644
index f4cc6e3aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a3d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/library_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/library_obj.gif
deleted file mode 100644
index cb55e33b5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/library_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090fe..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febec2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398f4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 614666731..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif
deleted file mode 100644
index ab3039ca2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif
deleted file mode 100644
index 83f916563..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e39b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif
deleted file mode 100644
index f277755f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d54..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca57e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc69..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
deleted file mode 100644
index dac498adf..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d66..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c473c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
deleted file mode 100644
index daff412d7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif
deleted file mode 100644
index 48380fc8e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a3d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif
deleted file mode 100644
index 307044047..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
deleted file mode 100644
index d7827341f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090fe..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif
deleted file mode 100644
index 43e165576..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febec2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
deleted file mode 100644
index 19c9cae05..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398f4..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif
deleted file mode 100644
index 93f0679d5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 614666731..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e96177a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
deleted file mode 100644
index f9941cec6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif
deleted file mode 100644
index e1fa98a87..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
deleted file mode 100644
index 2ec0ffb08..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
deleted file mode 100644
index 879329ef0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
deleted file mode 100644
index 6457e12be..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
deleted file mode 100644
index 653ab02a8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
deleted file mode 100644
index 2eb9efee5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
deleted file mode 100644
index e12d2ac10..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
deleted file mode 100644
index 5b5301060..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
deleted file mode 100644
index 189c3e9ac..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
deleted file mode 100644
index 624fe7ffc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
deleted file mode 100644
index 46e3e0875..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
deleted file mode 100644
index bb856a40f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
deleted file mode 100644
index 2820c5a9b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
deleted file mode 100644
index d238b56db..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
deleted file mode 100644
index fc97d8469..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
deleted file mode 100644
index 7dfe6e91d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
deleted file mode 100644
index aab4b505f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
deleted file mode 100644
index e0f50ccf7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa704..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
deleted file mode 100644
index e9ecba580..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3e7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763c9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif
deleted file mode 100644
index 231da6174..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e05..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 351539638..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa68a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79ef0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1adc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d25124251..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31dc9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif
deleted file mode 100644
index 81b1e3f61..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754deee..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519da..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4f6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d38..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif
deleted file mode 100644
index 3fb6df46f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
deleted file mode 100644
index 51b1d5a7f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
deleted file mode 100644
index 51b1d5a7f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a52..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif
deleted file mode 100644
index 9b72bf5de..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e56..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif
deleted file mode 100644
index 767a416a0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif
deleted file mode 100644
index ec315d5ff..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ace2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif
deleted file mode 100644
index 307044047..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif
deleted file mode 100644
index 3bc383173..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif
deleted file mode 100644
index d03e351aa..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece72..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a82e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc60689c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e997..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3fe6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif
deleted file mode 100644
index 9b93c9a7a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif
deleted file mode 100644
index 2038b22ad..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361ca..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java
deleted file mode 100644
index 686b14e15..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.common.jdt.internal.integration.ui;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.ICompilationUnitDocumentProvider;
-import org.eclipse.jdt.internal.ui.javaeditor.InternalClassFileEditorInput;
-import org.eclipse.jdt.ui.IWorkingCopyManager;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jst.common.jdt.internal.integration.WTPWorkingCopyManager;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Insert the type's description here. Creation date: (4/25/2001 7:05:36 PM)
- * 
- * @author: Administrator
- */
-public class WTPUIWorkingCopyManager extends WTPWorkingCopyManager {
-	private IWorkingCopyManager javaWorkingCopyManager;
-	private ICompilationUnitDocumentProvider cuDocumentProvider;
-	private HashMap editorInputs;
-	private CoreException lastError;
-
-	/**
-	 * WTPUIWorkingCopyManager constructor comment.
-	 */
-	public WTPUIWorkingCopyManager() {
-		super();
-		cuDocumentProvider = JavaPlugin.getDefault().getCompilationUnitDocumentProvider();
-		javaWorkingCopyManager = JavaUI.getWorkingCopyManager();
-	}
-
-	protected void syncConnect(final IEditorInput input, final ICompilationUnit cu) throws CoreException {
-		Display d = Display.getCurrent();
-		if (d != null) {
-			lastError = null;
-			d.syncExec(new Runnable() {
-				public void run() {
-					try {
-						connect(input, cu);
-					} catch (CoreException e) {
-						lastError = e;
-					}
-				}
-			});
-		} else
-			connect(input, cu);
-		if (lastError != null)
-			throw lastError;
-	}
-
-	/**
-	 * Connect the CompilationUnitDocumentProvider to the
-	 * 
-	 * @input and connect the annotation model from the provider to the IDocument of the
-	 * @input.
-	 */
-	protected void connect(IEditorInput input, ICompilationUnit cu) throws CoreException {
-		if (input != null && javaWorkingCopyManager != null && cuDocumentProvider != null ) {
-			javaWorkingCopyManager.connect(input);
-			getEditorInputs().put(cu, input);
-			IDocument doc = cuDocumentProvider.getDocument(input);
-			if (doc != null && cuDocumentProvider.getAnnotationModel(input)!= null)
-				cuDocumentProvider.getAnnotationModel(input).connect(doc);
-		}
-	}
-
-	protected void revertWorkingCopies() {
-		if (getEditorInputs().isEmpty())
-			return;
-		Iterator it = getEditorInputs().values().iterator();
-		IEditorInput input;
-		while (it.hasNext()) {
-			input = (IEditorInput) it.next();
-			revert(input);
-		}
-	}
-
-	/**
-	 * Disonnect the CompilationUnitDocumentProvider from the
-	 * 
-	 * @input and disconnect the annotation model from the provider from the IDocument of the
-	 * @input.
-	 */
-	protected void disconnect(IEditorInput input) {
-		IDocument doc = cuDocumentProvider.getDocument(input);
-		cuDocumentProvider.getAnnotationModel(input).disconnect(doc);
-		javaWorkingCopyManager.disconnect(input);
-	}
-
-	protected void revert(IEditorInput input) {
-		try {
-			cuDocumentProvider.resetDocument(input);
-		} catch (CoreException e) {
-			Logger.getLogger().logError(e);
-		}
-		IDocument doc = cuDocumentProvider.getDocument(input);
-		IAnnotationModel model = cuDocumentProvider.getAnnotationModel(input);
-
-		if (model instanceof AbstractMarkerAnnotationModel) {
-			AbstractMarkerAnnotationModel markerModel = (AbstractMarkerAnnotationModel) model;
-			markerModel.resetMarkers();
-		}
-		model.disconnect(doc);
-		javaWorkingCopyManager.disconnect(input);
-	}
-
-	protected void disconnectEditorInputs() {
-		Iterator it = getEditorInputs().values().iterator();
-		IEditorInput input;
-		while (it.hasNext()) {
-			input = (IEditorInput) it.next();
-			disconnect(input);
-		}
-	}
-
-	protected void discardExistingCompilationUnits() {
-		if (getEditorInputs().isEmpty())
-			return;
-		Iterator it = getEditorInputs().values().iterator();
-		IEditorInput input;
-		while (it.hasNext()) {
-			input = (IEditorInput) it.next();
-			disconnect(input);
-		}
-	}
-
-	public Set getAffectedFiles() {
-		Set aSet = new HashSet();
-		Iterator it = getEditorInputs().keySet().iterator();
-		ICompilationUnit unit = null;
-		IResource resource = null;
-		while (it.hasNext()) {
-			unit = (ICompilationUnit) it.next();
-			if (isDirty(unit)) {
-				try {
-					resource = unit.getUnderlyingResource();
-				} catch (JavaModelException ignore) {
-					continue;
-				}
-				if (resource instanceof IFile)
-					aSet.add(resource);
-			}
-		}
-		return aSet;
-	}
-
-	protected IEditorInput getEditorInput(ICompilationUnit cu) {
-		IEditorInput input = primGetEditorInput(cu);
-		if (input == null) {
-			try {
-				input = getEditorInput((IJavaElement) cu);
-			} catch (JavaModelException e) {
-				//Ignore
-			}
-		}
-		return input;
-	}
-
-	protected IEditorInput getEditorInput(IJavaElement element) throws JavaModelException {
-		while (element != null) {
-			switch (element.getElementType()) {
-				case IJavaElement.COMPILATION_UNIT : {
-					ICompilationUnit cu = (ICompilationUnit) element;
-					if (cu.isWorkingCopy())
-						cu = cu.getPrimary();
-					IResource resource = cu.getUnderlyingResource();
-					if (resource.getType() == IResource.FILE)
-						return new FileEditorInput((IFile) resource);
-					break;
-				}
-				case IJavaElement.CLASS_FILE :
-					return new InternalClassFileEditorInput((IClassFile) element);
-			}
-			element = element.getParent();
-		}
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (4/25/2001 7:30:20 PM)
-	 * 
-	 * @return java.util.HashMap
-	 */
-	protected java.util.HashMap getEditorInputs() {
-		if (editorInputs == null)
-			editorInputs = new HashMap(20);
-		return editorInputs;
-	}
-
-	/**
-	 * Returns the working copy remembered for the compilation unit encoded in the given editor
-	 * input. Does not connect the edit model to the working copy.
-	 * 
-	 * @param input
-	 *            ICompilationUnit
-	 * @return the working copy of the compilation unit, or <code>null</code> if the input does
-	 *         not encode an editor input, or if there is no remembered working copy for this
-	 *         compilation unit
-	 */
-	public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException {
-		if (cu == null || cu.isWorkingCopy()) {
-			return cu;
-		}
-		ICompilationUnit newCU = super.getExistingWorkingCopy(cu);
-		if (newCU != null)
-			return newCU;
-		IEditorInput editorInput = getEditorInput(cu);
-		return javaWorkingCopyManager.getWorkingCopy(editorInput);
-	}
-
-	/**
-	 * Returns the working copy remembered for the compilation unit.
-	 * 
-	 * @param input
-	 *            ICompilationUnit
-	 * @return the working copy of the compilation unit, or <code>null</code> if there is no
-	 *         remembered working copy for this compilation unit
-	 */
-	public org.eclipse.jdt.core.ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
-		if (forNewCU)
-			return super.getWorkingCopy(cu, forNewCU);
-		return primGetWorkingCopy(cu);
-	}
-
-	public boolean isDirty(ICompilationUnit cu) {
-		if (cu == null)
-			return false;
-		IDocumentProvider p = cuDocumentProvider;
-		return p == null ? false : p.canSaveDocument(getEditorInput(cu));
-	}
-
-	/**
-	 * mustSaveDocument method comment.
-	 */
-	public boolean isSaveNeeded() {
-		Iterator it = getEditorInputs().entrySet().iterator();
-		while (it.hasNext()) {
-			if (cuDocumentProvider.mustSaveDocument(it.next()))
-				return true;
-		}
-		return false;
-	}
-
-	protected void primDispose() {
-		super.primDispose();
-		discardExistingCompilationUnits();
-		editorInputs = null;
-		javaWorkingCopyManager = null;
-	}
-
-	protected void primRevert() {
-		super.primRevert();
-		revertWorkingCopies();
-		editorInputs = null;
-		javaWorkingCopyManager = null;
-	}
-
-	protected IEditorInput primGetEditorInput(ICompilationUnit cu) {
-		return (IEditorInput) getEditorInputs().get(cu);
-	}
-
-	/**
-	 * Returns the working copy remembered for the compilation unit encoded in the given editor
-	 * input.
-	 * 
-	 * @param input
-	 *            ICompilationUnit
-	 * @return the working copy of the compilation unit, or <code>null</code> if the input does
-	 *         not encode an editor input, or if there is no remembered working copy for this
-	 *         compilation unit
-	 */
-	protected org.eclipse.jdt.core.ICompilationUnit primGetWorkingCopy(ICompilationUnit cu) throws CoreException {
-		if (cu == null) {
-			return cu;
-		}
-		ICompilationUnit primary = cu.getPrimary();
-		ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(primary);
-		if (newCU != null)
-			return newCU;
-		IEditorInput editorInput = primGetEditorInput(primary);
-		if (editorInput == null) {
-			editorInput = getEditorInput(cu);
-			syncConnect(editorInput, cu);
-		}
-		if (cu.isWorkingCopy())
-			return cu;
-		return javaWorkingCopyManager.getWorkingCopy(editorInput);
-	}
-
-	/**
-	 * This will save all of the referenced CompilationUnits to be saved.
-	 */
-	protected void primSaveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
-		super.primSaveCompilationUnits(null);
-		saveExistingCompilationUnits(monitor);
-	}
-
-	protected void primSaveDocument(IEditorInput input, IDocument doc, IProgressMonitor monitor) throws CoreException {
-		try {
-			cuDocumentProvider.saveDocument(monitor, input, doc, true); // overwrite if needed
-		} catch (CoreException ex) {
-			if (!isFailedWriteFileFailure(ex))
-				throw ex;
-			IResource resource = (IResource) input.getAdapter(IRESOURCE_CLASS);
-			if (resource == null || resource.getType() != IResource.FILE || !resource.getResourceAttributes().isReadOnly())
-				throw ex;
-
-			if (getSaveHandler().shouldContinueAndMakeFileEditable((IFile) resource))
-				cuDocumentProvider.saveDocument(monitor, input, doc, false);
-			else
-				throw ex;
-		}
-	}
-
-	protected void saveDocument(IEditorInput input, IProgressMonitor monitor) {
-		IDocument doc = cuDocumentProvider.getDocument(input);
-		boolean canSave = cuDocumentProvider.canSaveDocument(input);
-		try {
-			if (canSave) {
-				ICompilationUnit unit = javaWorkingCopyManager.getWorkingCopy(input);
-				synchronized (unit) {
-					cuDocumentProvider.aboutToChange(input);
-					primSaveDocument(input, doc, monitor);
-				}
-			}
-		} catch (CoreException e) {
-			WTPCommonPlugin.getDefault().getLogger().logError(e);
-			throw new SaveFailedException(e);
-		} finally {
-			if (canSave)
-				cuDocumentProvider.changed(input);
-		}
-	}
-
-	/**
-	 * This will save all of the referenced CompilationUnits to be saved.
-	 */
-	protected void saveExistingCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
-		if (getEditorInputs().isEmpty())
-			return;
-		if (!validateState()) {
-			if (monitor != null)
-				monitor.setCanceled(true);
-			return;
-		}
-		Iterator it = getEditorInputs().entrySet().iterator();
-		Map.Entry entry;
-		//	ICompilationUnit cu;
-		IEditorInput input;
-		try {
-			while (it.hasNext()) {
-				entry = (Map.Entry) it.next();
-				//			cu = (ICompilationUnit) entry.getKey();
-				input = (IEditorInput) entry.getValue();
-				try {
-					saveDocument(input, null);
-				} finally {
-					disconnect(input);
-				}
-			}
-		} finally {
-			getEditorInputs().clear();
-		}
-	}
-
-	/**
-	 * Call validateEdit for all read only IFiles corresponding to each WorkingCopy.
-	 * 
-	 * @return boolean
-	 */
-	private boolean validateState() {
-		List readOnlyFiles = getReadOnlyModifiedFiles();
-		if (readOnlyFiles != null && !readOnlyFiles.isEmpty()) {
-			IFile[] files = new IFile[readOnlyFiles.size()];
-			readOnlyFiles.toArray(files);
-			IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			Object ctx = win == null ? null : win.getShell();
-			IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files, ctx);
-			return status.isOK();
-		}
-		return true;
-	}
-
-	private List getReadOnlyModifiedFiles() {
-		List readOnlyFiles = null;
-		IFile readOnlyFile = null;
-		Iterator it = getEditorInputs().entrySet().iterator();
-		Map.Entry entry;
-		//	ICompilationUnit cu;
-		IEditorInput input;
-		IDocumentProvider docProv = cuDocumentProvider;
-		while (it.hasNext()) {
-			readOnlyFile = null;
-			entry = (Map.Entry) it.next();
-			//		cu = (ICompilationUnit) entry.getKey();
-			input = (IEditorInput) entry.getValue();
-			if (docProv.canSaveDocument(input))
-				readOnlyFile = getReadOnlyFile(input);
-			if (readOnlyFile != null) {
-				if (readOnlyFiles == null)
-					readOnlyFiles = new ArrayList();
-				readOnlyFiles.add(readOnlyFile);
-			}
-		}
-		return readOnlyFiles;
-	}
-
-	private IFile getReadOnlyFile(IEditorInput input) {
-		if (input instanceof IFileEditorInput) {
-			IFileEditorInput finput = (IFileEditorInput) input;
-			IFile file = finput.getFile();
-			if (file.isReadOnly())
-				return file;
-		}
-		return null;
-	}
-
-
-	protected void addDeletedCompilationUnit(ICompilationUnit cu) {
-		IEditorInput input = primGetEditorInput(cu);
-		if (input != null)
-			disconnect(input);
-		getEditorInputs().remove(cu);
-		super.addDeletedCompilationUnit(cu);
-	}
-
-	/**
-	 * @see com.ibm.etools.j2ee.workbench.IJ2EEWorkingCopyManager#hasWorkingCopies()
-	 */
-	public boolean hasWorkingCopies() {
-		return super.hasWorkingCopies() || (editorInputs != null && !editorInputs.isEmpty());
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
deleted file mode 100644
index 67fdc5c7e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
+++ /dev/null
@@ -1,1205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *     Stefan Dimov, stefan.dimov@sap.com - bugs 207826, 222651
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.dialogs.ChangeLibDirDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.DependencyConflictResolveDialog;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.ui.DoubleCheckboxTableItem;
-import org.eclipse.jst.j2ee.internal.ui.DoubleCheckboxTableViewer;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-
-public class AddModulestoEARPropertiesPage implements IJ2EEDependenciesControl, Listener {
-
-	protected final IProject project;
-	protected final J2EEDependenciesPage propPage; 
-	protected IVirtualComponent earComponent = null;
-	protected Text componentNameText;
-	protected Label availableModules;
-	protected CheckboxTableViewer availableComponentsViewer;
-	protected Button selectAllButton;
-	protected Button deselectAllButton;
-	protected Button projectJarButton;
-	protected Button externalJarButton;
-	protected Button addVariableButton;
-	protected Button changeLibPathButton;
-	protected Composite buttonColumn;
-
-	protected String libDir = null;
-	protected String oldLibDir;
-	protected List j2eeComponentList = new ArrayList();
-	protected List javaProjectsList = new ArrayList();
-	protected List j2eeLibElementList = new ArrayList();
-	protected List javaLibProjectsList = new ArrayList();	
-	protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS;
-	protected boolean isVersion5;
-	protected Set libsToUncheck;
-	
-	//[Bug 238264] the cached list of jars selected using 'add jar' or 'add external jars'
-	protected List<IVirtualComponent> addedJARComponents = new ArrayList<IVirtualComponent>();
-
-
-	/**
-	 * Constructor for AddModulestoEARPropertiesControl.
-	 */
-	public AddModulestoEARPropertiesPage(final IProject project, final J2EEDependenciesPage page) { 
-		this.project = project;
-		this.propPage = page;
-		earComponent = ComponentCore.createComponent(project);
-		boolean hasEE5Facet = false;
-		try {
-			IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-			if(facetedProject != null){
-				IProjectFacetVersion facetVersion = facetedProject.getProjectFacetVersion(EarUtilities.ENTERPRISE_APPLICATION_FACET);
-				if(facetVersion.equals(EarUtilities.ENTERPRISE_APPLICATION_50)){
-					hasEE5Facet = true;
-				}
-			}
-		} catch (CoreException e) {
-			Logger.getLogger().log(e);
-		}
-		
-		if(hasEE5Facet){
-			String earDDVersion = JavaEEProjectUtilities.getJ2EEDDProjectVersion(project);
-			if (earDDVersion.equals(J2EEVersionConstants.VERSION_5_0_TEXT)) {
-				isVersion5 = true;
-				Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
-				if (app != null)
-					oldLibDir = app.getLibraryDirectory();
-				if (oldLibDir == null) oldLibDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
-				libDir = oldLibDir;
-			}
-		}
-		libsToUncheck = new HashSet();
-	}
-	
-	public Composite createContents(final Composite parent) { 
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.EAR_Modules_Desc);
-		createListGroup(composite);
-		refresh();
-	    Dialog.applyDialogFont(parent);
-		return composite;
-	}
-
-	protected void createListGroup(Composite parent) {
-		Composite listGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		listGroup.setLayout(layout);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		gData.horizontalIndent = 5;
-		listGroup.setLayoutData(gData);
-
-		availableModules = new Label(listGroup, SWT.NONE);
-		gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		availableModules.setText(J2EEUIMessages.getResourceString("AVAILABLE_J2EE_COMPONENTS")); //$NON-NLS-1$ = "Available dependent JARs:"
-		availableModules.setLayoutData(gData);
-		createTableComposite(listGroup);
-	}
-
-	public boolean performOk() {
-		NullProgressMonitor monitor = new NullProgressMonitor();
-		if (isVersion5) {
-			if (libDir.length() == 0) {
-				
-				MessageDialog dlg = new MessageDialog(null,  
-						J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR),
-			            null, J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR_WARN_QUESTION), 
-			            MessageDialog.QUESTION, new String[] {J2EEUIMessages.YES_BUTTON, 
-																J2EEUIMessages.NO_BUTTON, 
-																J2EEUIMessages.CANCEL_BUTTON}, 1);
-				switch (dlg.open()) {
-					case 0: break; 
-					case 1: {
-						handleChangeLibDirButton(false);
-						return false;
-					}
-					case 2: return false;
-					default: return false;
-				}			
-			}			
-			updateLibDir(monitor);
-		}
-		removeModulesFromEAR(monitor);		
-		addModulesToEAR(monitor);
-		refresh();
-		return true;
-	}
-	
-	public void performDefaults() {
-	}
-	
-	public boolean performCancel() {
-		return true;
-	}
-	
-	public void dispose() {
-	}
-
-	public void setVisible(boolean visible) {
-	}
-	
-	private List newJ2EEModulesToAdd(boolean inLibFolder){
-		if (inLibFolder && !isVersion5) return null;
-		List newComps = new ArrayList();
-		List comps = inLibFolder ? j2eeLibElementList : j2eeComponentList;
-		if (comps != null && !comps.isEmpty()){
-			for (int i = 0; i < comps.size(); i++){
-				IVirtualComponent handle = (IVirtualComponent)comps.get(i);
-				if (ClasspathDependencyUtil.isClasspathComponentDependency(handle)) {
-					continue;
-				}
-				if( !inEARAlready(handle))
-					newComps.add(handle);
-			}
-		}
-		return newComps;
-	}
-		
-	private void updateLibDir(IProgressMonitor monitor) {
-		if (libDir.equals(oldLibDir)) return;
-		final IEARModelProvider earModel = (IEARModelProvider)ModelProviderManager.getModelProvider(project);
-		final Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
-		oldLibDir = app.getLibraryDirectory();
-		if (oldLibDir == null) oldLibDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
-		earModel.modify(new Runnable() {
-			public void run() {			
-			app.setLibraryDirectory(libDir);
-		}}, null);
-	}
-	
-	protected void createDD(IProgressMonitor monitor) {
-		if( earComponent != null ){
-			IDataModelOperation op = generateEARDDOperation();
-			try {
-				op.execute(monitor, null);
-			} catch (ExecutionException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-	}
-	
-	private void execAddOp(IProgressMonitor monitor, List componentList, String path) throws CoreException {
-		if (componentList == null || componentList.isEmpty()) return;
-		IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-		
-		dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);					
-		dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, componentList);
-		
-		//[Bug 238264] the uri map needs to be manually set correctly
-		Map uriMap = new HashMap();
-		IVirtualComponent virtComp;
-		String virtCompURIMapName;
-		for(int i=0; i<componentList.size(); i++) {
-			virtComp = (IVirtualComponent)componentList.get(i);
-			virtCompURIMapName = getVirtualComponentNameWithExtension(virtComp);	
-			uriMap.put(virtComp, virtCompURIMapName);
-		}
-		dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
-		
-        if (isVersion5) dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-
-		IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-		if (stat != OK_STATUS)
-			throw new CoreException(stat);
-		try {
-			dm.getDefaultOperation().execute(monitor, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().log(e);
-		}		
-	}
-	
-	private void execAddOp1(IProgressMonitor monitor, List jProjList, List j2eeCompList, String path)
-													throws CoreException {
-		if (!jProjList.isEmpty()) {
-			Set moduleProjects = new HashSet();
-			for (int i = 0; i < jProjList.size(); i++) {
-				try {
-					IProject proj = (IProject) jProjList.get(i);
-					moduleProjects.add(proj);
-					IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
-					migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, proj.getName());
-					migrationdm.getDefaultOperation().execute(monitor, null);
-
-
-					IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
-					List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
-					IVirtualComponent targetcomponent = ComponentCore.createComponent(proj);
-					targetCompList.add(targetcomponent);
-
-					refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
-					refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
-					if (isVersion5) refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-					
-
-					// referenced java projects should have archiveName attribute
-					((Map)refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP)).put(targetcomponent, proj.getName().replace(' ', '_') + IJ2EEModuleConstants.JAR_EXT);
-
-					refdm.getDefaultOperation().execute(monitor, null);
-					j2eeCompList.add(targetcomponent);
-				} catch (ExecutionException e) {
-					Logger.getLogger().log(e);
-				}
-			}
-			EarFacetRuntimeHandler.updateModuleProjectRuntime(earComponent.getProject(), moduleProjects, new NullProgressMonitor());
-		} // end 
-		
-	}
-	
-	private IStatus addModulesToEAR(IProgressMonitor monitor) {
-		IStatus stat = OK_STATUS;
-		try {
-			if( earComponent != null ){
-				final List list = newJ2EEModulesToAdd(false);
-				final List bndList = newJ2EEModulesToAdd(true);
-				final boolean shouldRun = (list != null && !list.isEmpty()) || !javaProjectsList.isEmpty();
-				final boolean shouldBndRun = isVersion5 && 
-											((bndList != null && !bndList.isEmpty()) || !javaLibProjectsList.isEmpty());
-				if(shouldRun || shouldBndRun){
-					IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
-
-						public void run(IProgressMonitor monitor) throws CoreException{
-							if (shouldRun) {
-								execAddOp(monitor, list, J2EEConstants.EAR_ROOT_DIR);
-								execAddOp1(monitor, javaProjectsList, j2eeComponentList, J2EEConstants.EAR_ROOT_DIR);								
-							} 
-							if (shouldBndRun) {
-								execAddOp(monitor, bndList, libDir);
-								execAddOp1(monitor, javaLibProjectsList, j2eeLibElementList, libDir);																
-							} 
-						}
-					};
-					J2EEUIPlugin.getWorkspace().run(runnable, monitor);
-				}
-			}
-		} catch (Exception e) {
-			Logger.getLogger().log(e);
-		}
-		
-		//[Bug 238264] clear out the cache because they should all either be added as references now
-		//	or no longer checked and therefor not wanted by the user
-		this.addedJARComponents.clear();
-		
-		return OK_STATUS;
-	}
-	
-	private void remComps(List list, String path) {
-		if( !list.isEmpty()){
-			try {
-				// retrieve all dependencies on these components within the scope of the EAR
-				Map dependentComps = getEARModuleDependencies(earComponent, list);
-				// remove the components from the EAR
-				IDataModelOperation op = removeComponentFromEAROperation(earComponent, list, path);
-				op.execute(null, null);
-				// if that succeeded, remove all EAR-scope J2EE dependencies on these components
-				J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(earComponent.getProject());
-				removeEARComponentDependencies(dependentComps);
-			} catch (ExecutionException e) {
-				Logger.getLogger().log(e);
-			}
-		}	
-	}
-	
-	private IStatus removeModulesFromEAR(IProgressMonitor monitor) {
-		IStatus stat = OK_STATUS;
-		if (!isVersion5) {
-			if(earComponent != null && j2eeComponentList != null) {
-				List list = getComponentsToRemove();
-				remComps(list, J2EEConstants.EAR_ROOT_DIR);
-			}			
-		} else {	
-			if( earComponent != null && j2eeComponentList != null) {
-				List[] list = getComponentsToRemoveUpdate(!libDir.equals(oldLibDir)); 
-				remComps(list[0], J2EEConstants.EAR_ROOT_DIR);
-				
-				remComps(list[1], oldLibDir);
-			}
-		}
-		return stat;
-	}		
-	
-	private Map getEARModuleDependencies(final IVirtualComponent earComponent, final List components) {
-		final Map dependentComps = new HashMap();
-		// get all current references to project within the scope of this EAR
-		for (int i = 0; i < components.size(); i++) {
-			
-			final List compsForProject = new ArrayList();
-			final IVirtualComponent comp = (IVirtualComponent) components.get(i);
-			final IProject[] dependentProjects = DependencyGraphManager.getInstance().getDependencyGraph().getReferencingComponents(comp.getProject());
-			for (int j = 0; j < dependentProjects.length; j++) {
-				final IProject project = dependentProjects[j];
-				// if this is an EAR, can skip
-				if (J2EEProjectUtilities.isEARProject(project)) {
-					continue;
-				}
-				final IVirtualComponent dependentComp = ComponentCore.createComponent(project);
-				// ensure that the project's share an EAR
-				final IProject[] refEARs = J2EEProjectUtilities.getReferencingEARProjects(project);
-				boolean sameEAR = false;
-				for (int k = 0; k < refEARs.length; k++) {
-					if (refEARs[k].equals(earComponent.getProject())) {
-						sameEAR = true;
-						break;
-					}
-				}
-				if (!sameEAR) {
-					continue;
-				}
-				// if the dependency is a web lib dependency, can skip
-				if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-					IVirtualReference ref = dependentComp.getReference(comp.getName());
-					if (ref != null && ref.getRuntimePath().equals(new Path("/WEB-INF/lib"))) { //$NON-NLS-1$
-						continue;
-					}
-				}
-				compsForProject.add(dependentComp);
-			}
-			dependentComps.put(comp, compsForProject);
-		}
-		return dependentComps;
-	}
-	
-	private void removeEARComponentDependencies(final Map dependentComps) throws ExecutionException {
-		final Iterator targets = dependentComps.keySet().iterator();
-		while (targets.hasNext()) {
-			final IVirtualComponent target = (IVirtualComponent) targets.next();
-			final List sources = (List) dependentComps.get(target);
-			for (int i = 0; i < sources.size(); i++) {
-				final IVirtualComponent source = (IVirtualComponent) sources.get(i);
-				final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
-				model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, source);
-				final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-				modHandlesList.add(target);
-				model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
-				model.getDefaultOperation().execute(null, null);
-				// update the manifest
-				removeManifestDependency(source, target);
-			}
-		}
-	}
-	
-	private void removeManifestDependency(final IVirtualComponent source, final IVirtualComponent target) 
-		throws ExecutionException {
-		final String sourceProjName = source.getProject().getName();
-		String targetProjName; 
-		if (target instanceof J2EEModuleVirtualArchiveComponent) {
-			targetProjName = ((J2EEModuleVirtualArchiveComponent)target).getName();
-			String[] pathSegments = targetProjName.split("" + IPath.SEPARATOR);
-			targetProjName = pathSegments[pathSegments.length - 1];
-		} else {
-			targetProjName = target.getProject().getName();
-		}
-		final IProgressMonitor monitor = new NullProgressMonitor();
-		final IFile manifestmf = J2EEProjectUtilities.getManifestFile(source.getProject());
-		final ArchiveManifest mf = J2EEProjectUtilities.readManifest(source.getProject());
-		if (mf == null)
-			return;
-		final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, sourceProjName);
-		updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
-		String[] cp = mf.getClassPathTokenized();
-		List cpList = new ArrayList();
-		String cpToRemove = (targetProjName.endsWith(".jar")) ? 
-				targetProjName : 
-					targetProjName + ".jar";//$NON-NLS-1$
-		for (int i = 0; i < cp.length; i++) {
-			if (!cp[i].equals(cpToRemove)) {
-				cpList.add(cp[i]);
-			}
-		}
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
-		updateManifestDataModel.getDefaultOperation().execute(monitor, null );
-	}
-	
-	protected IDataModelOperation generateEARDDOperation() {		
-		IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider());
-		model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, earComponent);					
-		model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);		
-		return model.getDefaultOperation();
-	}
-	
-	protected IDataModelOperation removeComponentFromEAROperation(IVirtualComponent sourceComponent, List targetComponentsHandles, String dir) {
-		IDataModel model = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
-		model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
-		List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-		modHandlesList.addAll(targetComponentsHandles);
-		model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
-        model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, dir);		
-		return model.getDefaultOperation();
-	}
-	
-	protected List getComponentsToRemove(){
-		//j2eeComponentList = getCheckedJ2EEElementsAsList();
-		List list = new ArrayList();
-		if( earComponent != null && list != null ){
-			IVirtualReference[] oldrefs = earComponent.getReferences();
-			for (int j = 0; j < oldrefs.length; j++) {
-				IVirtualReference ref = oldrefs[j];
-				IVirtualComponent handle = ref.getReferencedComponent();
-				if(!j2eeComponentList.contains(handle) && (isVersion5 ? !j2eeLibElementList.contains(handle) : true)){
-					list.add(handle);
-				}
-			}
-		}
-		return list;		
-	}
-	
-	// EAR5 case
-	protected List[] getComponentsToRemoveUpdate(boolean dirUpdated){
-		//j2eeComponentList = getCheckedJ2EEElementsAsList();
-		List[] list = new ArrayList[2];
-		list[0] = new ArrayList();
-		list[1] = new ArrayList();
-		if( earComponent != null && list != null ){
-			IVirtualReference[] oldrefs = earComponent.getReferences();
-			for (int j = 0; j < oldrefs.length; j++) {
-				IVirtualReference ref = oldrefs[j];
-				IVirtualComponent handle = ref.getReferencedComponent();
-				if(!j2eeComponentList.contains(handle) && ref.getRuntimePath().isRoot()) {
-					list[0].add(handle);
-				}
-				if((!j2eeLibElementList.contains(handle) || dirUpdated) &&
-						ref.getRuntimePath().toString().equals(oldLibDir)) {	
-					list[1].add(handle);
-				}
-			}
-		}
-		return list;		
-	}
-	
-	
-	public void handleEvent(Event event) {
-		if (event.widget == selectAllButton)
-			handleSelectAllButtonPressed();
-		else if (event.widget == deselectAllButton)
-			handleDeselectAllButtonPressed();
-		else if(event.widget == projectJarButton)
-			handleSelectProjectJarButton();
-		else if(event.widget == externalJarButton)
-			handleSelectExternalJarButton();
-		else if(event.widget == addVariableButton)
-			handleSelectVariableButton();
-		else if(event.widget == changeLibPathButton) {
-			this.handleChangeLibDirButton(true);
-		}
-	}
-
-	private void handleSelectAllButtonPressed() {
-		availableComponentsViewer.setAllChecked(true);
-		j2eeComponentList = getCheckedJ2EEElementsAsList(true);
-		javaProjectsList = getCheckedJavaProjectsAsList(true);		
-		if (isVersion5) {
-			j2eeLibElementList = getCheckedJ2EEElementsAsList(false);
-			javaLibProjectsList = getCheckedJavaProjectsAsList(false);			
-		} 
-	}
-
-	private void handleDeselectAllButtonPressed() {
-		availableComponentsViewer.setAllChecked(false);
-		if (isVersion5) {
-			((DoubleCheckboxTableViewer)availableComponentsViewer).setAllSecondChecked(false);
-			libsToUncheck.clear();
-		}
-		j2eeComponentList = new ArrayList();
-		javaProjectsList = new ArrayList();
-		if (isVersion5) {
-			j2eeLibElementList = new ArrayList();
-			javaLibProjectsList = new ArrayList();			
-		}
-	}
-	
-	/**
-	 * [Bug 238264]
-	 * Add an archive as a potential new reference for this.earComponent
-	 * NOTE1: the given archive will not be added as a potential reference if there is already a reference to it
-	 * NOTE2: the given archive will only be added as an actual reference when this.performOk is invoked
-	 * 
-	 * @param archive the archive to add as a potential new reference in this.earComponent
-	 * 			
-	 */
-	private void addPotentialNewReference(IVirtualComponent archive) {
-		//check to see if a reference to the given archive already exists
-		IVirtualReference [] existingRefs = earComponent.getReferences();
-		IVirtualComponent referencedComponent;
-		boolean refAlreadyExists = false;
-		for(int i=0;i<existingRefs.length && !refAlreadyExists;i++){
-			referencedComponent = existingRefs[i].getReferencedComponent();
-			refAlreadyExists = referencedComponent.equals(archive);
-		}
-		
-		//only add the archive as a potentialy new reference if it does not already exist
-		if(!refAlreadyExists) {
-			this.j2eeComponentList.add(archive);
-			this.addedJARComponents.add(archive);
-		} else {
-			//TODO should inform user that they selected an already referenced archive?
-		}
-	}
-	
-	private void handleSelectExternalJarButton(){
-		IPath[] selected= BuildPathDialogAccess.chooseExternalJAREntries(propPage.getShell());
-
-		if (selected != null) {
-			for (int i= 0; i < selected.length; i++) {
-				
-				String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
-				IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
-							selected[i].toString());
-				
-				this.addPotentialNewReference(archive);
-			}
-			refresh();
-		}
-		
-	}
-
-	private void handleSelectVariableButton(){
-		IPath existingPath[] = new Path[0];
-		IPath[] paths =  BuildPathDialogAccess.chooseVariableEntries(propPage.getShell(), existingPath);
-		
-		if (paths != null) {
-			refresh();
-			for (int i = 0; i < paths.length; i++) {
-				IPath resolvedPath= JavaCore.getResolvedVariablePath(paths[i]);
-
-				java.io.File file = new java.io.File(resolvedPath.toOSString());
-				if( file.isFile() && file.exists()){
-					String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
-					
-					IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
-								paths[i].toString());
-					
-					this.addPotentialNewReference(archive);
-				}else{
-					//display error
-				}
-			}
-			refresh();
-		}	
-	}
-	
-	private void handleChangeLibDirButton(boolean warnBlank) {					
-		IVirtualFile vFile = earComponent.getRootFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
-		if (!vFile.exists()) {
-			if (!MessageDialog.openQuestion(null, 
-					J2EEUIMessages.getResourceString(J2EEUIMessages.NO_DD_MSG_TITLE), 
-					J2EEUIMessages.getResourceString(J2EEUIMessages.GEN_DD_QUESTION))) return;
-			createDD(new NullProgressMonitor());
-		}
-		Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
-		if (libDir == null) {
-			libDir = app.getLibraryDirectory();
-			if (libDir == null) libDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
-		}
-		
-		ChangeLibDirDialog dlg = new ChangeLibDirDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getShell(), libDir, warnBlank);
-		if (dlg.open() == Dialog.CANCEL) return;
-		libDir = dlg.getValue().trim();
-		if (libDir.length() > 0) {
-			if (!libDir.startsWith(J2EEConstants.EAR_ROOT_DIR)) libDir = IPath.SEPARATOR + libDir;
-		}
-				
-	}
-
-	
-	protected void createTableComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(gData);
-		fillComposite(composite);
-	}
-
-	public void fillComposite(Composite parent) {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		parent.setLayout(layout);
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createTable(parent);
-		createButtonColumn(parent);
-	}
-
-	protected void createButtonColumn(Composite parent) {
-		buttonColumn = createButtonColumnComposite(parent);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		buttonColumn.setLayoutData(data);
-		createPushButtons();
-	}
-
-	protected void createPushButtons() {
-		selectAllButton = createPushButton(SELECT_ALL_BUTTON);
-		deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
-		projectJarButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_JAR));//$NON-NLS-1$
-		externalJarButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.EXTERNAL_JAR));//$NON-NLS-1$
-		addVariableButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.ADDVARIABLE));//$NON-NLS-1$
-		if (isVersion5) changeLibPathButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.CHANGE_LIB_DIR));//$NON-NLS-1$
-	}
-
-	protected Button createPushButton(String label) {
-		Button aButton = primCreatePushButton(label, buttonColumn);
-		aButton.addListener(SWT.Selection, this);
-		aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return aButton;
-	}
-
-	public Button primCreatePushButton(String label, Composite aButtonColumn) {
-		Button aButton = new Button(aButtonColumn, SWT.PUSH);
-		aButton.setText(label);
-		return aButton;
-	}
-
-	public Composite createButtonColumnComposite(Composite parent) {
-		Composite aButtonColumn = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		aButtonColumn.setLayout(layout);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		aButtonColumn.setLayoutData(data);
-		return aButtonColumn;
-	}
-
-	public Group createGroup(Composite parent) {
-		return new Group(parent, SWT.NULL);
-	}
-
-	protected void createTable(Composite parent) {
-		availableComponentsViewer = createavailableComponentsViewer(parent);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		availableComponentsViewer.getTable().setLayoutData(gd);
-
-		if (earComponent != null) {
-			int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(earComponent);
-			AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(earComponent, j2eeVersion);
-			availableComponentsViewer.setContentProvider(provider);
-			availableComponentsViewer.setLabelProvider(provider);
-			
-			addTableListeners();
-		}
-	}
-
-	protected void addTableListeners() {
-		addCheckStateListener();
-	}
-
-	protected void addCheckStateListener() {
-		availableComponentsViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				if (!(event instanceof SecondCheckBoxStateChangedEvent) && (isVersion5)) {
-					DoubleCheckboxTableViewer vr = (DoubleCheckboxTableViewer)event.getSource();
-					Object[] items = vr.getUncheckedItems();					
-					for (int i = 0; i < items.length; i++) {
-						DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)items[i];
-						if (item.getSecondChecked()) {
-							item.setSecondChecked(false);
-							libsToUncheck.remove(event.getElement());
-						}
-					}
-				}
-				if ((event instanceof SecondCheckBoxStateChangedEvent)) {
-					SecondCheckBoxStateChangedEvent evt = (SecondCheckBoxStateChangedEvent)event;
-					DoubleCheckboxTableItem tblItem = evt.getTableItem();
-					if (tblItem.getSecondChecked() && isConflict(tblItem.getData())) {
-						DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				                .getShell(), DependencyConflictResolveDialog.DLG_TYPE_2);
-						if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
-							tblItem.setSecondChecked(false);
-							return;
-						}
-					}	
-					if (tblItem.getSecondChecked()) {
-						if (!tblItem.getChecked())
-							tblItem.setChecked(true);						
-						libsToUncheck.add(event.getElement());	
-					} else {
-						libsToUncheck.remove(event.getElement());
-					}
-				}
-				j2eeComponentList = getCheckedJ2EEElementsAsList(true);
-				javaProjectsList = getCheckedJavaProjectsAsList(true);		
-				if (isVersion5) {
-					j2eeLibElementList = getCheckedJ2EEElementsAsList(false);
-					javaLibProjectsList = getCheckedJavaProjectsAsList(false);					
-					
-				} 
-			}
-		});
-	}
-	
-	protected Object[] getCPComponentsInEar(boolean inLibFolder) {
-		List list = new ArrayList();
-		Map pathToComp = new HashMap();
-		IVirtualReference refs[] = earComponent.getReferences();
-		for( int i=0; i< refs.length; i++){
-			IVirtualReference ref = refs[i];
-			if ((ref.getRuntimePath().isRoot() && !inLibFolder) ||
-				(!ref.getRuntimePath().isRoot() && inLibFolder) ||
-				!isVersion5) {
-				
-				IVirtualComponent comp = ref.getReferencedComponent();
-				AvailableJ2EEComponentsForEARContentProvider.addClasspathComponentDependencies(list, pathToComp, comp);
-			}
-		}
-		return list.toArray();
-	}
-	
-	protected Object[] getComponentsInEar(boolean inLibFolder) {
-		List list = new ArrayList();
-		IVirtualReference refs[] = earComponent.getReferences();
-		for( int i=0; i< refs.length; i++){
-			IVirtualReference ref = refs[i];
-			if ((ref.getRuntimePath().isRoot() && !inLibFolder) ||
-				(!ref.getRuntimePath().isRoot() && inLibFolder) ||
-				!isVersion5) {
-				
-				IVirtualComponent comp = ref.getReferencedComponent();
-				list.add(comp);
-			}
-		}
-		return list.toArray();
-	}
-	
-	/**
-	 * 
-	 * @param componentHandle
-	 * @return
-	 * @description  returns true is a component is already in the EAR as a dependent
-	 */
-	protected boolean inEARAlready(IVirtualComponent component){
-		IVirtualReference refs[] = earComponent.getReferences();
-		for( int i=0; i< refs.length; i++){
-			IVirtualReference ref = refs[i];
-			if  ( ref.getReferencedComponent().equals( component ))
-				return true;
-		}	
-		return false;
-	}
-		
-	// The next two are used in EAR5 case
-	protected List getCheckedJ2EEElementsAsList(boolean singleChecked) {		
-		Object[] elements;
-		if (isVersion5) {
-			elements = singleChecked ? ((DoubleCheckboxTableViewer)availableComponentsViewer).getSingleCheckedElements():
-									   ((DoubleCheckboxTableViewer)availableComponentsViewer).getDoubleCheckedElements();
-				
-		} else {
-			elements = availableComponentsViewer.getCheckedElements();
-		}
-		List list;
-		if (elements == null || elements.length == 0)
-			list = new ArrayList(0); // Collections.EMPTY_LIST would cause UnsupportedOperationException when a later attempt to add to it is made
-		else {
-			list = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IVirtualComponent) {
-					list.add(elements[i]);
-				}
-			}
-		}
-		return list;
-	}
-	
-	protected List getCheckedJavaProjectsAsList(boolean single) {
-		Object[] elements;
-		if (isVersion5) {
-			elements = single ? ((DoubleCheckboxTableViewer)availableComponentsViewer).getSingleCheckedElements() :
-								((DoubleCheckboxTableViewer)availableComponentsViewer).getDoubleCheckedElements();
-		} else {
-			elements = availableComponentsViewer.getCheckedElements();
-		}
-		
-		List list;
-		if (elements == null || elements.length == 0)
-			list = new ArrayList(0); // Collections.EMPTY_LIST would cause UnsupportedOperationException when a later attempt to add to it is made
-		else {
-			list = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IProject) {
-					list.add(elements[i]);
-				}
-			}
-		}
-		return list;
-	}
-		
-	protected List getLibFolderLibsAsList() {
-		Object[] items = ((DoubleCheckboxTableViewer)availableComponentsViewer).getSecondCheckedItems();
-		List list;
-		if (items == null || items.length == 0)
-			list = new ArrayList(0); // Collections.EMPTY_LIST would cause UnsupportedOperationException when a later attempt to add to it is made
-		else {
-			list = new ArrayList();
-			for (int i = 0; i < items.length; i++) {
-				Object element = ((DoubleCheckboxTableItem)items[i]).getData();
-				if (element instanceof IProject) {
-					list.add(element);
-				}
-			}
-		}
-		return list;
-	}
-
-	public CheckboxTableViewer createavailableComponentsViewer(Composite parent) {
-		int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
-		Table table = isVersion5 ? new Table(parent, flags) : new Table(parent, flags);
-		availableComponentsViewer = isVersion5 ? new DoubleCheckboxTableViewer(table, 2) : new CheckboxTableViewer(table);
-
-		// set up table layout
-		TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
-		tableLayout.addColumnData(new ColumnWeightData(200, true));
-		tableLayout.addColumnData(new ColumnWeightData(200, true));
-		if (isVersion5) tableLayout.addColumnData(new ColumnWeightData(200, true));
-		table.setLayout(tableLayout);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		availableComponentsViewer.setSorter(null);
-
-		// table columns
-		TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0);
-		fileNameColumn.setText(ManifestUIResourceHandler.JAR_Module_UI_); 
-		fileNameColumn.setResizable(true);
-
-		TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1);
-		projectColumn.setText(ManifestUIResourceHandler.Project_UI_); 
-		projectColumn.setResizable(true);
-		
-		if (isVersion5) {
-			TableColumn bndColumn = new TableColumn(table, SWT.NONE, 2);
-			bndColumn.setText(ManifestUIResourceHandler.Packed_In_Lib_UI_); 
-			bndColumn.setResizable(true);			
-		}
-			
-		tableLayout.layout(table, true);
-		return availableComponentsViewer;
-
-	}
-
-	private boolean shouldBeDisabled(IVirtualComponent component) {
-		if (J2EEProjectUtilities.isApplicationClientComponent(component)) return true;
-		if (J2EEProjectUtilities.isEARProject(component.getProject()) && component.isBinary()) return false;
-		if (J2EEProjectUtilities.isEJBComponent(component)) return true;
-		if (J2EEProjectUtilities.isDynamicWebComponent(component)) return true;
-		if (J2EEProjectUtilities.isJCAComponent(component)) return true;
-		if (J2EEProjectUtilities.isStaticWebProject(component.getProject())) return true;
-		if (J2EEProjectUtilities.isProjectOfType(component.getProject(), IJ2EEFacetConstants.JAVA)) return false;
-		return false;
-	}
-	
-	public void refresh() {
-
-		IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
-		availableComponentsViewer.setInput(input);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		int numlines = Math.min(10, availableComponentsViewer.getTable().getItemCount());
-		data.heightHint = availableComponentsViewer.getTable().getItemHeight() * numlines;
-		availableComponentsViewer.getTable().setLayoutData(data);
-
-		//[Bug 238264] for all the jars in the cache temparaly list them in the grid
-		// until the user applys the changes
-		for(IVirtualComponent jarComponent : this.addedJARComponents) {
-			availableComponentsViewer.add(jarComponent);
-		}
-		
-		TableItem [] items = availableComponentsViewer.getTable().getItems();
-		List list = new ArrayList();
-		//Object[] comps = getComponentsInEar();
-		Object[] cpComps;
-		Object[] cpLibComps = new Object[0];
-		HashSet j2eeComponentSet = new HashSet();
-		HashSet j2eeLibComponentSet = new HashSet();		
-		if (isVersion5) {
-			if( j2eeComponentList.isEmpty() ){
-				Object[] comps = getComponentsInEar(false);
-				j2eeComponentList.addAll( Arrays.asList(comps));
-			}
-			if( j2eeLibElementList.isEmpty() ){
-				Object[] comps = getComponentsInEar(true);
-				j2eeLibElementList.addAll( Arrays.asList(comps));
-			}			
-			// get all Classpath contributions to the Ear
-			cpComps = getCPComponentsInEar(false);
-			j2eeComponentList.addAll(Arrays.asList(cpComps));	
-			cpLibComps = getCPComponentsInEar(true);
-			j2eeLibElementList.addAll(Arrays.asList(cpLibComps));	
-			for (int i = 0; i < j2eeLibElementList.size(); i++) {
-				j2eeLibComponentSet.add(j2eeLibElementList.get(i));
-			}
-				
-		} else {
-			if( j2eeComponentList.isEmpty() ){
-				Object[] comps = getComponentsInEar(false);
-				j2eeComponentList.addAll( Arrays.asList(comps));
-			}
-			// get all Classpath contributions to the Ear
-			cpComps = getCPComponentsInEar(false);
-			j2eeComponentList.addAll(Arrays.asList(cpComps));			
-		}
-		for (int i = 0; i < j2eeComponentList.size(); i++) {
-			j2eeComponentSet.add(j2eeComponentList.get(i));
-		}
-				
-		for( int i=0; i< items.length; i++ ){
-			Object element = items[i].getData();
-			if( element instanceof IVirtualComponent){
-				IVirtualComponent comp = (IVirtualComponent)element;
-				if (j2eeComponentSet.contains(comp)) {
-					list.add(comp);
-				}
-				if (isVersion5) {
-					DoubleCheckboxTableItem dcbItem = (DoubleCheckboxTableItem)items[i]; 
-					boolean secondEnabled = dcbItem.getSecondEnabled();
-					if (shouldBeDisabled(comp) == secondEnabled) dcbItem.setSecondEnabled(!secondEnabled);						
-					dcbItem.setSecondChecked(j2eeLibComponentSet.contains(comp));
-					if (j2eeLibComponentSet.contains(comp)) list.add(comp);
-				}
-			}
-		}		
-		
-		availableComponentsViewer.setCheckedElements(list.toArray());
-		availableComponentsViewer.setGrayedElements(cpComps);
-		if (isVersion5) availableComponentsViewer.setGrayedElements(cpLibComps);
-
-	//	j2eeComponentList.addAll(list);
-		GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		buttonColumn.setLayoutData(btndata);
-
-	}
-
-	private boolean isConflict(Object lib) {
-		IProject libProj = (lib instanceof IProject) ? (IProject)lib : ((IVirtualComponent)lib).getProject(); 
-		IProject earProject = earComponent.getProject();	
-		try {			
-			IVirtualComponent cmp = ComponentCore.createComponent(earProject);
-			IProject[] earRefProjects = earProject.getReferencedProjects();
-			for (int i = 0; i < earRefProjects.length; i++) {	
-				if (!J2EEProjectUtilities.isEARProject(earRefProjects[i]) &&
-						!earRefProjects[i].equals(libProj)) {
-					IVirtualComponent cmp1 = ComponentCore.createComponent(earRefProjects[i]);
-					IVirtualReference[] refs = cmp1.getReferences();
-					for (int j = 0; j < refs.length; j++) {
-						if (refs[j].getReferencedComponent().getProject().equals(libProj)) return true;
-					}
-				}	
-			}
-			return false;
-		} catch (CoreException ce) {
-			Logger.getLogger().log(ce);
-		}		
-		return false;
-	}	
-	
-	private void handleSelectProjectJarButton(){
-		IPath[] selected= BuildPathDialogAccess.chooseJAREntries(propPage.getShell(), project.getLocation(), new IPath[0]);
-	
-		if (selected != null) {
-			for (int i= 0; i < selected.length; i++) {
-				//IPath fullPath = project.getFile(selected[i]).getFullPath();	
-				String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
-				IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
-							selected[i].makeRelative().toString());
-				
-				this.addPotentialNewReference(archive);
-			}
-			refresh();
-		}
-		
-	}
-	
-	/**
-	 * [Bug 238264]
-	 * determines a unique URI mapping name for a given component
-	 * this is in case two components have the same name.
-	 * 
-	 * @return returns a valid (none duplicate) uri mapping name for the given component\
-	 */
-	private String getURIMappingName(IVirtualComponent archive) {
-		
-		//get the default uri map name for the given archive
-		IPath componentPath = Path.fromOSString(archive.getName());
-		String uriMapName = componentPath.lastSegment().replace(' ', '_');
-		
-		
-		//check to be sure this uri mapping is not already in use by another reference
-		boolean dupeArchiveName;
-		String refedCompName;
-		int lastDotIndex;
-		String increment;
-		IVirtualReference [] existingRefs = earComponent.getReferences();
-		for(int i=0;i<existingRefs.length;i++){
-			refedCompName = existingRefs[i].getReferencedComponent().getName();
-			
-			//if uri mapping names of the refed component and the given archive are the same
-			//  find a new uri map name for the given archive
-			if(existingRefs[i].getArchiveName().equals(uriMapName)){
-				dupeArchiveName = true;
-				//find a new uriMapName for the given component
-				for(int j=1; dupeArchiveName; j++){
-					lastDotIndex = uriMapName.lastIndexOf('.');
-					increment = "_"+j; //$NON-NLS-1$
-					
-					//create the new potential name
-					if(lastDotIndex != -1){
-						uriMapName = uriMapName.substring(0, lastDotIndex) + increment + uriMapName.substring(lastDotIndex);
-					} else {
-						uriMapName = uriMapName.substring(0)+increment;
-					}
-					
-					//determine if the new potential name is valid
-					for(int k=0; k<existingRefs.length; k++) {
-						dupeArchiveName = existingRefs[k].getArchiveName().equals(uriMapName);
-						if(dupeArchiveName) {
-							break;
-						}
-					}
-				}
-			}
-		}
-		
-		return uriMapName;
-	}
-	
-	/**
-	 * Method returns the name of the given IVirtualComponent being sure the correct extension
-	 * is on the end of the name, this is important for internal projects. Added for [Bug 241509]
-	 * 
-	 * @param virtComp the IVirtualComponent to get the name of with the correct extension
-	 * @return the name of the given IVirtualComponent with the correct extension
-	 */
-	private String getVirtualComponentNameWithExtension(IVirtualComponent virtComp) {
-		String virtCompURIMapName = this.getURIMappingName(virtComp);
-		
-		boolean linkedToEAR = true;
-		try {
-			if(virtComp.isBinary()){
-				linkedToEAR = ((J2EEModuleVirtualArchiveComponent)virtComp).isLinkedToEAR();
-				((J2EEModuleVirtualArchiveComponent)virtComp).setLinkedToEAR(false);
-			}
-			if(JavaEEProjectUtilities.isDynamicWebComponent(virtComp)) {
-				if(!virtCompURIMapName.endsWith(IJ2EEModuleConstants.WAR_EXT)) {
-					//web module URIs need to end in WAR
-					virtCompURIMapName += IJ2EEModuleConstants.WAR_EXT;
-				}
-			} else if(JavaEEProjectUtilities.isJCAComponent(virtComp)) {
-				if(!virtCompURIMapName.endsWith(IJ2EEModuleConstants.RAR_EXT)) {
-					//connector module URIs need to end in RAR
-					virtCompURIMapName += IJ2EEModuleConstants.RAR_EXT;
-				}
-			} else if(!virtCompURIMapName.endsWith(IJ2EEModuleConstants.JAR_EXT)) {
-				//all other modules (EJB, AppClient, Utility) need to end in JAR
-				virtCompURIMapName += IJ2EEModuleConstants.JAR_EXT;
-			}
-		} finally {
-			if(virtComp.isBinary()){
-				((J2EEModuleVirtualArchiveComponent)virtComp).setLinkedToEAR(linkedToEAR);
-			}
-		}
-		return virtCompURIMapName;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
deleted file mode 100644
index 40040d2f5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class AvailableJ2EEComponentsForEARContentProvider implements IStructuredContentProvider, ITableLabelProvider {
-	private int j2eeVersion;
-	private IVirtualComponent earComponent;
-	private boolean isEE5 = false;
-
-	public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {
-		super();
-		this.j2eeVersion = j2eeVersion;
-		earComponent = aEarComponent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (null != earComponent){
-			isEE5 = J2EEProjectUtilities.isJEEProject(earComponent.getProject());
-		}
-		Object[] empty = new Object[0];
-		if (!(inputElement instanceof IWorkspaceRoot))
-			return empty;
-		IProject[] projects = ((IWorkspaceRoot) inputElement).getProjects();
-		if (projects == null || projects.length == 0)
-			return empty;
-		List validCompList = new ArrayList();
-		Map pathToComp = new HashMap();
-		for (int i = 0; i < projects.length; i++) {
-			// get flexible project
-			IProject project = projects[i];
-			if(ModuleCoreNature.isFlexibleProject(project)){
-				IVirtualComponent component = ComponentCore.createComponent(project);
-				if (J2EEProjectUtilities.isApplicationClientProject(project) ||
-						J2EEProjectUtilities.isEJBProject(project) ||
-						J2EEProjectUtilities.isDynamicWebProject(project) ||
-						J2EEProjectUtilities.isJCAProject(project) ||
-						J2EEProjectUtilities.isUtilityProject(project) ){
-					int compJ2EEVersion = J2EEVersionUtil.convertVersionStringToInt(component);
-					if( compJ2EEVersion <= j2eeVersion){
-						validCompList.add(component);
-					} else if(isEE5){
-						validCompList.add(component);
-					}
-				}else if(null != earComponent && J2EEProjectUtilities.isEARProject(project)){
-					//find the ArchiveComponent
-					if( component.equals( earComponent )){
-						IVirtualReference[] newrefs = component.getReferences();
-						for( int k=0; k< newrefs.length; k++ ){
-							IVirtualReference tmpref = newrefs[k];
-							IVirtualComponent referencedcomp = tmpref.getReferencedComponent();		
-							boolean isBinary = referencedcomp.isBinary();
-							if( isBinary ){
-								validCompList.add(referencedcomp);
-							} else {
-								addClasspathComponentDependencies(validCompList, pathToComp, referencedcomp);
-							}
-						}	
-					}
-				}
-			} else
-				try {
-					if (project.exists() && project.isAccessible() && project.hasNature("org.eclipse.jdt.core.javanature") ){ //$NON-NLS-1$
-						if( !project.getName().startsWith(".") )
-							validCompList.add(project);
-					}
-				} catch (CoreException e) {
-					Logger.getLogger().log(e);
-				}
-		}
-		return validCompList.toArray();
-	}
-
-	public static void addClasspathComponentDependencies(final List componentList, final Map pathToComp, final IVirtualComponent referencedComponent) {
-		if (referencedComponent instanceof J2EEModuleVirtualComponent) {
-			J2EEModuleVirtualComponent j2eeComp = (J2EEModuleVirtualComponent) referencedComponent;
-			IVirtualReference[] cpRefs = j2eeComp.getJavaClasspathReferences();
-			for (int j=0; j < cpRefs.length; j++) {
-				String unresolvedURI = null;
-				// only ../ mappings supported at this level
-				if (!cpRefs[j].getRuntimePath().equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
-					continue;
-				}
-				// if the absolute path for this component already has a mapping, skip (the comp might be contributed by more than
-				// one child module)
-				final IPath path = ClasspathDependencyUtil.getClasspathVirtualReferenceLocation(cpRefs[j]);
-				final IVirtualComponent comp = (IVirtualComponent) pathToComp.get(path);
-				if (comp != null) {
-					// replace with a temp VirtualArchiveComponent whose IProject is set to a new pseudo name that is
-					// the concatenation of all project contributions for that archive
-					if (comp instanceof VirtualArchiveComponent) {
-						final VirtualArchiveComponent oldComp = (VirtualArchiveComponent) comp;
-						componentList.remove(comp);
-						final VirtualArchiveComponent newComponent = ClassPathSelection.updateDisplayVirtualArchiveComponent(oldComp, cpRefs[j]);
-						pathToComp.put(path, newComponent);
-						componentList.add(newComponent);
-					}
-					continue;
-				} else {
-					pathToComp.put(path, cpRefs[j].getReferencedComponent());
-				}
-				componentList.add(cpRefs[j].getReferencedComponent());
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		if (element instanceof IVirtualComponent) {
-			IVirtualComponent comp = (IVirtualComponent)element;
-			String name = ""; //$NON-NLS-1$
-			if( columnIndex == 0 ){
-				if (ClasspathDependencyUtil.isClasspathComponentDependency(comp)) {
-					return ClasspathDependencyUtil.getClasspathComponentDependencyDisplayString(comp);
-				}
-				IModelProvider provider = ModelProviderManager.getModelProvider(earComponent.getProject());
-				if (provider instanceof IEARModelProvider)
-				{
-					name = ((IEARModelProvider)provider).getModuleURI(comp);
-				}
-				if( name == null || name == "" ){ //$NON-NLS-1$
-					name = comp.getName();
-				}
-				return name;
-			} else if (columnIndex == 1) {
-				return comp.getProject().getName();
-			} else if (columnIndex == 2) {
-				return "";
-			}
-		} else if (element instanceof IProject){
-			if (columnIndex != 2) {
-				return ((IProject)element).getName();
-			} else {
-				return "";
-			}
-		}		
-		return null;
-	}	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		//do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		//do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
-	 *      java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		//do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClassHelperAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClassHelperAdapterFactory.java
deleted file mode 100644
index 163ae74c2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClassHelperAdapterFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-public class ClassHelperAdapterFactory implements IAdapterFactory {
-	
-	private static final Class IFILE_CLASS = IFile.class;
-	private static final Class IRESOURCE_CLASS = IResource.class;
-	
-	private static final Class[] ADAPTER_TYPES = new Class[] {
-		IFILE_CLASS, IRESOURCE_CLASS
-	};
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if(IRESOURCE_CLASS == adapterType || IFILE_CLASS == adapterType) {
-			if(adaptableObject instanceof J2EEJavaClassProviderHelper) {
-				J2EEJavaClassProviderHelper provider = (J2EEJavaClassProviderHelper) adaptableObject;
-				try {
-					IResource resource = (IResource) provider.getAdapter(IRESOURCE_CLASS);
-					return resource;
-				} catch (RuntimeException e) {
-					J2EEUIPlugin.logError(0, e.getMessage(), e);
-					return null;
-				}
-			}
-		}
-		return null;
-	}
-
-	public Class[] getAdapterList() {
-		return ADAPTER_TYPES;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
deleted file mode 100644
index 9edc01159..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
+++ /dev/null
@@ -1,647 +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
- *     Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelEvent;
-import org.eclipse.jst.j2ee.internal.dialogs.DependencyConflictResolveDialog;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ClasspathTableManager implements Listener, ICommonManifestUIConstants {
-
-	protected Button useClientJARsBtn;
-	protected Button useServerJARsBtn;
-	protected Button useAnyJARsBtn;
-	protected Button upButton;
-	protected Button downButton;
-	protected Button selectAllButton;
-	protected Button deselectAllButton;
-	protected IClasspathTableOwner owner;
-	protected Composite buttonColumn;
-	protected ClasspathModel model;
-	protected CheckboxTableViewer availableJARsViewer;
-	protected IValidateEditListener validateEditListener;
-	/**
-	 * @deprecated this field should be removed
-	 */
-	protected boolean isWLPEntry;
-	protected Group radioGroup;
-	
-	protected boolean readOnly;
-	protected AvailableJarsProvider availableJarsProvider;
-	protected Button externalJarButton;
-	protected Button projectJarButton;
-	protected Button addVariableButton;	
-	
-	protected Set compsToUncheck = new HashSet();
-
-	/**
-	 * Constructor for ButtonBarManager.
-	 */
-	public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model) {
-		this(owner, model, null);
-	}
-	
-	public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model, IValidateEditListener listener) {
-		super();
-		this.owner = owner;
-		this.model = model;
-		this.validateEditListener = listener;
-	}
-	public void fillComposite(Composite parent) {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		parent.setLayout(layout);
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createRadioGroup(parent);
-		createTable(parent);
-		createButtonColumn(parent);
-	}
-	
-	public void fillWLPComposite(Composite parent) {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		parent.setLayout(layout);
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createTable(parent);
-		createWLPButtonColumn(parent);
-	}
-	
-	public void fillWebRefComposite(Composite parent) {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		parent.setLayout(layout);
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createTable(parent);
-		createWebRefButtonColumn(parent);
-	}
-	
-	private void initializeEJBClientDefaults() {
-		if (model == null || model.getClassPathSelection() == null)
-			return;
-		boolean shouldUseServerJARs = false;
-		ClassPathSelection selection = model.getClassPathSelection(); 
-		int filterLevel;
-		boolean ejbSelected = selection.isAnyEJBJarSelected();
-		boolean clientSelected = selection.isAnyEJBClientJARSelected();
-		if (ejbSelected && clientSelected)
-			filterLevel = ClassPathSelection.FILTER_NONE;
-		else if (shouldUseServerJARs) {
-			if (clientSelected)
-				filterLevel = ClassPathSelection.FILTER_NONE;
-			else
-				filterLevel = ClassPathSelection.FILTER_EJB_CLIENT_JARS;
-		} else {
-			if (ejbSelected)
-				filterLevel = ClassPathSelection.FILTER_NONE;
-			else
-				filterLevel = ClassPathSelection.FILTER_EJB_SERVER_JARS;
-		}
-		initFilterLevel(filterLevel);
-	}
-	
-	private void initFilterLevel(int filterLevel) {
-		model.getClassPathSelection().setFilterLevel(filterLevel);
-		switch (filterLevel) {
-			case (ClassPathSelection.FILTER_NONE) :
-				useAnyJARsBtn.setSelection(true);
-				useClientJARsBtn.setSelection(false);
-				useServerJARsBtn.setSelection(false);
-				break;
-			case (ClassPathSelection.FILTER_EJB_CLIENT_JARS) :
-				useAnyJARsBtn.setSelection(false);
-				useClientJARsBtn.setSelection(false);
-				useServerJARsBtn.setSelection(true);
-				break;
-			case (ClassPathSelection.FILTER_EJB_SERVER_JARS) :
-				useAnyJARsBtn.setSelection(false);
-				useClientJARsBtn.setSelection(true);
-				useServerJARsBtn.setSelection(false);
-				break;
-		}
-	}
-
-	private void createRadioGroup(Composite parent) {
-		radioGroup = owner.createGroup(parent);
-		radioGroup.setText(EJB_CLIENT_RADIO_UI_);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		data.horizontalIndent = 0;
-		GridLayout layout = new GridLayout(3, false);
-		radioGroup.setLayout(layout);
-		radioGroup.setLayoutData(data);
-		
-		useServerJARsBtn = createRadioButton(USE_EJB_SERVER_JARs_UI_, radioGroup);
-		useClientJARsBtn = createRadioButton(USE_EJB_CLIENT_JARs_UI_, radioGroup);
-		useAnyJARsBtn	 = createRadioButton(USE_BOTH_UI_, radioGroup);
-		initializeEJBClientDefaults();
-	}
-	
-	protected void createButtonColumn(Composite parent) {
-		buttonColumn = owner.createButtonColumnComposite(parent);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		buttonColumn.setLayoutData(data);
-		createPushButtons();
-	}
-	
-	protected void createWLPButtonColumn(Composite parent) {
-		buttonColumn = owner.createButtonColumnComposite(parent);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		buttonColumn.setLayoutData(data);
-		createWLPPushButtons();
-	}
-	
-	protected void createWebRefButtonColumn(Composite parent) {
-		buttonColumn = owner.createButtonColumnComposite(parent);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		buttonColumn.setLayoutData(data);
-		createWebRefPushButtons();
-	}
-	
-	protected void createTable(Composite parent) {
-		availableJARsViewer = owner.createAvailableJARsViewer(parent);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		availableJARsViewer.getTable().setLayoutData(gd);
-		availableJarsProvider = new AvailableJarsProvider();
-		availableJARsViewer.setContentProvider(availableJarsProvider);
-		availableJARsViewer.setLabelProvider(availableJarsProvider);
-		addTableListeners();
-	}
-	
-	protected void createWLPPushButtons() {
-		selectAllButton = createPushButton(SELECT_ALL_BUTTON);
-		deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
-		projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR")); //$NON-NLS-1$
-		externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR")); //$NON-NLS-1$
-		addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$			
-		if (isReadOnly()) {
-			selectAllButton.setEnabled(false);
-			deselectAllButton.setEnabled(false);
-			projectJarButton.setEnabled(false);
-			externalJarButton.setEnabled(false);
-			addVariableButton.setEnabled(false);
-		} 
-	}
-	
-	protected void createWebRefPushButtons() {
-		selectAllButton = createPushButton(SELECT_ALL_BUTTON);
-		deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
-		if (isReadOnly()) {
-			selectAllButton.setEnabled(false);
-			deselectAllButton.setEnabled(false);
-		} 
-	}
-
-	protected void createPushButtons() {
-		upButton = createPushButton(UP_BUTTON);
-		downButton = createPushButton(DOWN_BUTTON);
-		selectAllButton = createPushButton(SELECT_ALL_BUTTON);
-		deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
-		if (isReadOnly()) {
-			upButton.setEnabled(false);
-			downButton.setEnabled(false);
-			selectAllButton.setEnabled(false);
-			deselectAllButton.setEnabled(false);
-		} 
-	}
-	
-	protected void createWebLibPushButtons() {
-		selectAllButton = createPushButton(SELECT_ALL_BUTTON);
-		deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
-		projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR")); //$NON-NLS-1$
-		externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR")); //$NON-NLS-1$
-		addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$			
-		if (isReadOnly()) {
-			selectAllButton.setEnabled(false);
-			deselectAllButton.setEnabled(false);
-		} 
-	}
-
-	protected Button createPushButton(String label) {
-		Button aButton = owner.primCreatePushButton(label, buttonColumn);
-		aButton.addListener(SWT.Selection, this);
-		aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return aButton;
-	}
-	
-	protected Button createRadioButton(String label, Composite parent) {
-		Button aButton = owner.primCreateRadioButton(label, parent);
-		aButton.addListener(SWT.Selection, this);
-		return aButton;
-	}
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		
-		ClasspathModelEvent evt = new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED);
-		model.fireNotification(evt);
-		if (event.widget == upButton)
-			upButtonSelected();
-		else if (event.widget == downButton)
-			downButtonSelected();
-		else if (event.widget == selectAllButton)
-			selectAllButtonSelected();
-		else if (event.widget == deselectAllButton)
-			deselectAllButtonSelected();
-		else if (event.widget == useServerJARsBtn)
-			handleServerJARsButtonSelected();
-		else if (event.widget == useClientJARsBtn)
-			handleClientJARsButtonSelected();
-		else if (event.widget == useAnyJARsBtn)
-			handleAnyJARsButtonSelected();
-		else if(event.widget == projectJarButton)
-			handleSelectProjectJarButton();
-		else if(event.widget == externalJarButton)
-			handleSelectExternalJarButton();
-		else if(event.widget == addVariableButton)
-			handleSelectVariableButton();		
-	}
-	
-	private void handleSelectExternalJarButton(){
-		 //owner.handleSelectExternalJarButton();
-		if( owner instanceof WebLibDependencyPropertiesPage){
-			WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
-			control.handleSelectExternalJarButton();
-		} 
-	}
-	private void handleSelectProjectJarButton(){
-		 //owner.handleSelectExternalJarButton();
-		if( owner instanceof WebLibDependencyPropertiesPage){
-			WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
-			control.handleSelectProjectJarButton();
-		} 
-	}
-	
-	private void handleSelectVariableButton(){
-		//owner.handleSelectVariableButton();
-		if( owner instanceof WebLibDependencyPropertiesPage){
-			WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
-			control.handleSelectVariableButton();
-		} 		
-	}
-	
-	private void handleServerJARsButtonSelected() {
-		model.selectFilterLevel(ClassPathSelection.FILTER_EJB_CLIENT_JARS);
-		refresh();
-	}
-
-	private void handleClientJARsButtonSelected() {
-		model.selectFilterLevel(ClassPathSelection.FILTER_EJB_SERVER_JARS);
-		refresh();
-	}
-
-	private void handleAnyJARsButtonSelected() {
-		model.selectFilterLevel(ClassPathSelection.FILTER_NONE);
-		refresh();
-	}
-
-	public boolean validatateEdit() {
-		return validateEditListener.validateState().isOK();
-	}
-
-	protected void deselectAllButtonSelected() {
-		if (!validatateEdit())
-			return;
-		availableJARsViewer.setAllChecked(false);
-		model.setAllClasspathElementsSelected(false);
-		compsToUncheck.clear();
-	}
-
-	protected void selectAllButtonSelected() {
-		if (!validatateEdit())
-			return;
-		availableJARsViewer.setAllChecked(true);
-		Object[] elements = availableJARsViewer.getCheckedElements(); 
-		model.setAllClasspathElementsSelected(Arrays.asList(elements), true);
-		for (int i = 0; i < elements.length; i++) {
-			ClasspathElement el = (ClasspathElement)elements[i];
-			el.getComponent().getAdapter(IVirtualComponent.class);
-			IVirtualComponent ar = el.getTargetComponent();
-			IVirtualComponent comp = (ar instanceof J2EEModuleVirtualArchiveComponent) ? ar : el.getComponent();
-			if (isLibrary(comp)) 
-				compsToUncheck.add(comp);
-		}
-	}
-
-	protected java.util.List getSelectionAsList() {
-		return ((IStructuredSelection) availableJARsViewer.getSelection()).toList();
-	}
-	
-	protected java.util.List getCheckedLibsAsList() {
-		List res = new LinkedList();
-		Iterator it = compsToUncheck.iterator();
-		while (it.hasNext()) {
-			IVirtualComponent comp = (IVirtualComponent)it.next();
-			res.add(comp);
-		}
-		return res;
-	}
-
-	protected void downButtonSelected() {
-		if (!validatateEdit())
-			return;
-		model.moveDown(getSelectionAsList());
-		refresh();
-	}
-
-	protected void upButtonSelected() {
-		if (!validatateEdit())
-			return;
-		model.moveUp(getSelectionAsList());
-		refresh();
-	}
-
-	/*
-	 * Updates the enable state of the all buttons
-	 */
-	protected void updateButtonEnablements() {
-		int[] indices = availableJARsViewer.getTable().getSelectionIndices();
-		if (upButton != null && downButton != null) {
-			upButton.setEnabled(canMoveUp(indices));
-			downButton.setEnabled(canMoveDown(indices, availableJARsViewer.getTable().getItemCount()));
-		}
-	}
-
-	protected boolean canMoveUp(int[] indices) {
-		return canMove(indices, 0);
-	}
-
-	protected boolean canMoveDown(int[] indices, int itemCount) {
-		return canMove(indices, itemCount - 1);
-	}
-
-	protected boolean canMove(int[] indices, int referenceIndex) {
-		int length = indices.length;
-		if (length == 0)
-			return false;
-		for (int i = 0; i < length; i++) {
-			if (indices[i] == referenceIndex)
-				return false;
-		}
-		return true;
-	}
-	
-	protected void addTableListeners() {
-		addCheckStateListener();
-		addSelectionListener();
-	}
-
-	protected void addCheckStateListener() {
-		availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				availableJARCheckStateChanged(event);
-			}
-		});
-	}
-
-	private boolean isLibrary(IVirtualComponent component) {
-		if (J2EEProjectUtilities.isApplicationClientComponent(component)) return false;
-		if (J2EEProjectUtilities.isEARProject(component.getProject()) && component.isBinary()) return true;
-		if (J2EEProjectUtilities.isEJBComponent(component)) return false;
-		if (J2EEProjectUtilities.isDynamicWebComponent(component)) return false;
-		if (J2EEProjectUtilities.isJCAComponent(component)) return false;
-		if (J2EEProjectUtilities.isStaticWebProject(component.getProject())) return false;
-		if (J2EEProjectUtilities.isProjectOfType(component.getProject(), IJ2EEFacetConstants.JAVA)) return true;
-		return true;
-	}			
-	
-	protected void availableJARCheckStateChanged(CheckStateChangedEvent event) {
-		ClasspathElement el = (ClasspathElement)event.getElement();
-		//226823 targeting a regular java project from web libs
-		if(el.getComponent() == null){
-			ClasspathElement element = (ClasspathElement) event.getElement();
-			model.setSelection(element, event.getChecked());
-			return;
-		}
-		el.getComponent().getAdapter(IVirtualComponent.class);
-		IVirtualComponent ar = el.getTargetComponent();
-		IVirtualComponent comp = (ar instanceof J2EEModuleVirtualArchiveComponent) ? ar : el.getComponent();
-		CheckboxTableViewer v = (CheckboxTableViewer)event.getSource();
-		if (isLibrary(comp) && event.getChecked()) {
-			if (isConflict(comp)) {
-				DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(PlatformUI.
-						getWorkbench().
-							getActiveWorkbenchWindow().
-								getShell(), 
-					  DependencyConflictResolveDialog.DLG_TYPE_1);
-				if (dlg.open() == dlg.BTN_ID_CANCEL) {
-					v.setChecked(el, false);
-					return;
-				}
-				
-			}
-			compsToUncheck.add(comp);
-		} else if (!event.getChecked()) {
-			compsToUncheck.remove(comp);
-		}
-		if (!J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject()) && (isReadOnly() || !validatateEdit() || (isMyClientJAR(event) && !event.getChecked()))) {
-			availableJARsViewer.setChecked(event.getElement(), !event.getChecked());
-			return;
-		}
-		ClasspathElement element = (ClasspathElement) event.getElement();
-		model.setSelection(element, event.getChecked());
-	}
-
-	
-	private boolean isConflict(IVirtualComponent lib) {
-		IProject[] ears = J2EEProjectUtilities.getReferencingEARProjects(lib.getProject());
-		for (int i = 0; i < ears.length; i++) {
-			if (J2EEProjectUtilities.isJEEProject(ears[i])) {
-				IVirtualComponent cmp = ComponentCore.createComponent(ears[i]);
-				IVirtualReference[] refs = cmp.getReferences();
-				for (int j = 0; j < refs.length; j++) {	
-					if (model.getProject().equals(refs[j].getReferencedComponent().getProject())) {
-						IVirtualReference ref = cmp.getReference(lib.getName());
-						if (!ref.getRuntimePath().isRoot()) return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	
-	
-	/**
-	 * @param event
-	 * @return
-	 */
-	private boolean isMyClientJAR(CheckStateChangedEvent event) {
-		ClasspathElement element = (ClasspathElement) event.getElement();
-		if(getClasspathSelection() != null)
-			return getClasspathSelection().isMyClientJAR(element);
-		return false;
-	}
-
-	protected void addSelectionListener() {
-		availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				tableSelectionChanged();
-			}
-		});
-	}
-
-	protected void tableSelectionChanged() {
-		if (!isReadOnly())
-			updateButtonEnablements();
-	}
-
-	protected ClassPathSelection getClasspathSelection() {
-		if (model == null || model.getSelectedEARComponent() == null && !(J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject())))
-			return null;
-		return model.getClassPathSelection();
-	}
-
-	public void refreshCheckedItems() {
-		if (getClasspathSelection() == null)
-			return;
-		java.util.List elements = getClasspathSelection().getClasspathElements();
-		for (int i = 0; i < elements.size(); i++) {
-			ClasspathElement element = (ClasspathElement) elements.get(i);
-			availableJARsViewer.setChecked(element, element.isSelected());
-			if (element.isClasspathDependency()) {
-				availableJARsViewer.setGrayed(element, true);
-			}
-		}
-	}
-
-	public void refresh() {
-		final IProject project = model.getComponent().getProject();
-		// if not a web project and it is either referenced by an EAR or a dynamic web project.
-		if (!isWLPEntry() && (!J2EEProjectUtilities.isStandaloneProject(project) || 
-				               (J2EEProjectUtilities.getReferencingWebProjects(project).length > 0))) {
-			availableJARsViewer.setInput(getClasspathSelection());
-			GridData data = new GridData(GridData.FILL_BOTH);
-			int numlines = Math.min(10, availableJARsViewer.getTable().getItemCount());
-			data.heightHint = availableJARsViewer.getTable().getItemHeight() * numlines;
-			availableJARsViewer.getTable().setLayoutData(data);
-			refreshCheckedItems();
-			updateButtonEnablements();
-		} else {
-			availableJARsViewer.setInput(model.getClassPathSelectionForWLPs());
-			GridData data = new GridData(GridData.FILL_BOTH);
-			int numlines = Math.min(10, availableJARsViewer.getTable().getItemCount());
-			data.heightHint = availableJARsViewer.getTable().getItemHeight() * numlines;
-			availableJARsViewer.getTable().setLayoutData(data);
-			refreshWLPCheckedItems();
-		}
-	}
-	
-	private void refreshWLPCheckedItems() {
-		if (availableJARsViewer.getInput() != null) {
-			java.util.List elements = ((ClassPathSelection) availableJARsViewer.getInput()).getClasspathElements();
-			for (int i = 0; i < elements.size(); i++) {
-				ClasspathElement element = (ClasspathElement) elements.get(i);
-				availableJARsViewer.setChecked(element, element.isSelected());
-				if (element.isClasspathDependency()) {
-					availableJARsViewer.setGrayed(element, true);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Gets the model.
-	 * @return Returns a ClasspathModel
-	 */
-	public ClasspathModel getModel() {
-		return model;
-	}
-
-	/**
-	 * Sets the model.
-	 * @param model The model to set
-	 */
-	public void setModel(ClasspathModel model) {
-		this.model = model;
-		initializeEJBClientDefaults();
-	}
-
-	/**
-	 * Returns the readOnly.
-	 * @return boolean
-	 */
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-
-	/**
-	 * Sets the readOnly.
-	 * @param readOnly The readOnly to set
-	 */
-	public void setReadOnly(boolean readOnly) {
-		this.readOnly = readOnly;
-	}
-
-	public boolean isWLPEntry() {
-		return model.isWLPModel();
-	}
-
-	/**
-	 * @deprecated do not use this method
-	 * @param isWLPEntry
-	 */
-	public void setWLPEntry(boolean isWLPEntry) {
-		this.isWLPEntry = isWLPEntry;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java
deleted file mode 100644
index 94f64b383..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface IClasspathTableOwner {
-	Button primCreatePushButton(String label, Composite buttonColumn);
-	Button primCreateRadioButton(String label, Composite parent);
-	CheckboxTableViewer createAvailableJARsViewer(Composite parent);
-	Composite createButtonColumnComposite(Composite parent);
-	//Button createHideEJBClientJARsButton(Composite parent); This method is never used hence commeting it out - vkb
-	Group createGroup(Composite parent);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java
deleted file mode 100644
index a6c4542a0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface ICommonManifestUIConstants {
-	String UP_BUTTON = ManifestUIResourceHandler.Up_1; 
-	String DOWN_BUTTON = ManifestUIResourceHandler.Down_2; 
-	String SELECT_ALL_BUTTON = ManifestUIResourceHandler.Select_All_3; 
-	String DE_SELECT_ALL_BUTTON = ManifestUIResourceHandler.Deselect_All_4; 
-	String ERROR_READING_MANIFEST_DIALOG_TITLE = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_TITLE; 
-	String SAVE_MANIFEST_WITH_ERROR =ManifestUIResourceHandler.SAVE_MANIFEST_WITH_ERROR; 
-	String ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR; 
-	String ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE; 
-	String MANIFEST_PROBLEM_1 = ManifestUIResourceHandler.MANIFEST_PROBLEM_1; 
-	String MANIFEST_PROBLEM_2 = ManifestUIResourceHandler.MANIFEST_PROBLEM_2; 
-	String MANIFEST_PROBLEM_3 = ManifestUIResourceHandler.MANIFEST_PROBLEM_3; 
-	String MANIFEST_PROBLEM_4 = ManifestUIResourceHandler.MANIFEST_PROBLEM_4; 
-	String REDIRECT_TEXT_EDITOR_UI_ = ManifestUIResourceHandler.REDIRECT_TEXT_EDITOR_UI_; 
-	
-	String EJB_CLIENT_RADIO_UI_		= CommonEditResourceHandler.getString("EJB_CLIENT_RADIO_UI_"); //$NON-NLS-1$
-	String USE_EJB_SERVER_JARs_UI_ 	= CommonEditResourceHandler.getString("USE_EJB_SERVER_JARs_UI_"); //$NON-NLS-1$
-	String USE_EJB_CLIENT_JARs_UI_ 	= CommonEditResourceHandler.getString("USE_EJB_CLIENT_JARs_UI_"); //$NON-NLS-1$
-	String USE_BOTH_UI_				= CommonEditResourceHandler.getString("USE_BOTH_UI_"); //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java
deleted file mode 100644
index 6005131bb..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Interface for classes that implement a portion the "J2EE Module Dependencies"
- * property page logic.
- */
-public interface IJ2EEDependenciesControl extends ICommonManifestUIConstants {
-	
-	/**
-	 * Creates the Composite associated with this control.
-	 * @param parent Parent Composite.
-	 * @return Composite for the control.
-	 */
-	Composite createContents(Composite parent);
-	
-	/**
-	 * Called when the property page's <code>performOk()</code> method is called.
-	 * @return
-	 */
-	boolean performOk();
-	
-	/**
-	 * Called when the property page's <code>performDefaults()</code> method is called.
-	 * @return
-	 */
-	void performDefaults();
-	
-	/**
-	 * Called when the property page's <code>performCancel()</code> method is called.
-	 * @return
-	 */
-	boolean performCancel();
-	
-	/**
-	 * Called when the property page's <code>setVisible()</code> method is called.
-	 * @return
-	 */
-	void setVisible(boolean visible);
-	
-	/**
-	 * Called when the property page's <code>dispose()</code> method is called.
-	 * @return
-	 */
-	void dispose();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
deleted file mode 100644
index fdf5cb31d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
+++ /dev/null
@@ -1,643 +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.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.INavigatorContentService;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.ComponentType;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.IComponentProjectMigrator;
-import org.eclipse.wst.common.componentcore.internal.Property;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.SimpleValidateEdit;
-import org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class J2EEComponentProjectMigrator implements IComponentProjectMigrator {
-
-	private static final String WEB_LIB_CONTAINER = "org.eclipse.jst.j2ee.internal.web.container";
-	private static final String WEB_LIB_PATH = "/WEB-INF/lib";
-	private static final String OLD_DEPLOYABLES_PATH = ".deployables";
-	private IProject project;
-	
-	private static final String[] J2EE_CONTENT_EXTENSION_IDS = new String[] {
-		"org.eclipse.jst.navigator.j2ee.ui.EARDDContent", //$NON-NLS-1$
-		"org.eclipse.jst.navigator.j2ee.ui.WebDDContent", //$NON-NLS-1$
-		"org.eclipse.jst.navigator.j2ee.ui.EJBDDContent", //$NON-NLS-1$
-		"org.eclipse.jst.navigator.j2ee.ui.ConnectorDDContent" //$NON-NLS-1$
-	};
-	
-	private static final String PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
-	
-	public J2EEComponentProjectMigrator() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public void migrateProject(IProject aProject) {
-		if (aProject.isAccessible() && (aProject.getFile(StructureEdit.MODULE_META_FILE_NAME).exists())) {
-			// The file corresponding to StructureEdit.MODULE_META_FILE_NAME is crucial to migration.
-			// If it does not exist, the project cannot be migrated. We should never fail the test for existence
-			// of the file, if we do then something has gone badly wrong.
-			Resource resource = WorkbenchResourceHelperBase.getResource(aProject.getFile(StructureEdit.MODULE_META_FILE_NAME), false);
-			if(resource != null && resource.isLoaded()){
-				// Unload the resource because the model inside the StructureEdit was cached when the 
-				// the project was imported, and files may have moved due to migration (.wtpmodules for example).
-				resource.unload();
-			}
-		
-			final List files = new ArrayList();
-			files.add(aProject.getFile(J2EEProjectUtilities.DOT_PROJECT));
-			files.add(aProject.getFile(J2EEProjectUtilities.DOT_CLASSPATH));
-			files.add(aProject.getFile(StructureEdit.MODULE_META_FILE_NAME));
-			if(SimpleValidateEdit.validateEdit(files)){
-				project = aProject;
-				
-				removeComponentBuilders(project);
-				if (multipleComponentsDetected())
-					createNewProjects();
-				String facetid = getFacetFromProject(project);
-				if (facetid.length() == 0)
-					addFacets(project);
-				J2EEComponentClasspathUpdater.getInstance().queueUpdate(project);
-			}
-		}
-		ensureJ2EEContentExtensionsEnabled();
-	}
-	
-	/**
-	 * Ensure the J2EE content extension ids are enabled on the project explorer 
-	 * for the projects being migrated.
-	 */
-	private void ensureJ2EEContentExtensionsEnabled() {
-		IViewPart view = null;
-		try {
-			view = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getActivePage().findView(PROJECT_EXPLORER);
-		} catch (Exception e) { 
-			//Just bail and return if there is no view
-		}
-		if (view == null)
-			return;
-		
-		INavigatorContentService contentService = (INavigatorContentService) view.getAdapter(INavigatorContentService.class);
-		CommonViewer viewer = (CommonViewer) view.getAdapter(CommonViewer.class);
-		
-		// Set the J2EE content extensions as enabled now that we have set the J2EE facets
-		if (contentService != null)
-			contentService.getActivationService().activateExtensions(J2EE_CONTENT_EXTENSION_IDS, false);
-		
-		// Update the viewer if we are in the current UI thread
-		if (viewer != null) {
-			Display display = viewer.getControl().getDisplay();
-			if (display!=null && Thread.currentThread().equals(display.getThread()))
-				viewer.refresh();
-		}
-	}
-
-		private void createNewProjects() {
-
-			StructureEdit se = null;
-			try {
-				se = StructureEdit.getStructureEditForWrite(project);
-				List comps = se.getComponentModelRoot().getComponents();
-				List removedComps = new ArrayList();
-				for (int i = 1;i<comps.size();i++) {
-					WorkbenchComponent comp = (WorkbenchComponent) comps.get(i);
-					IWorkspace ws = ResourcesPlugin.getWorkspace();
-					IProject newProj = ws.getRoot().getProject(comp.getName());
-					if (!newProj.exists()) {
-						try {
-							createProj(newProj,(!comp.getComponentType().getComponentTypeId().equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION)));
-							WtpUtils.addNatures(newProj);
-						} catch (CoreException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-					}
-					if (comp!=null && comp.getComponentType()!=null)
-						addFacetsToProject(newProj,comp.getComponentType().getComponentTypeId(),comp.getComponentType().getVersion(),false);
-					removedComps.add(comp);
-					IFolder compFolder = project.getFolder(comp.getName());
-					if (compFolder.exists())
-						try {
-							compFolder.delete(true,null);
-						} catch (CoreException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-				}
-				se.getComponentModelRoot().getComponents().removeAll(removedComps);
-				se.save(null);
-			
-			} finally {
-				if (se != null)
-					se.dispose();
-			}
-	
-		
-	}
-
-		private void createProj(IProject newProj, boolean isJavaProject) throws CoreException {
-			newProj.create(null);
-			IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(newProj.getName());
-//			if (isJavaProject)
-//				description.setNatureIds(new String[]{JavaCore.NATURE_ID});
-			description.setLocation(null);
-			newProj.open(null);
-			newProj.setDescription(description, null);
-		}
-
-		private boolean multipleComponentsDetected() {
-			StructureEdit se = null;
-			try {
-				se = StructureEdit.getStructureEditForRead(project);
-				if (se == null) return false;
-				if (se.getComponentModelRoot() == null) return false;
-				return se.getComponentModelRoot().getComponents().size() > 1;
-			} finally {
-				if (se != null)
-					se.dispose();
-			}
-	}
-
-		private void removeComponentBuilders(IProject aProject) {
-		try {
-			aProject.refreshLocal(IResource.DEPTH_INFINITE,null);
-		} catch (CoreException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		//IJavaProject javaP = JemProjectUtilities.getJavaProject(aProject);
-		List oldBuilders = new ArrayList();
-		oldBuilders.add("org.eclipse.wst.common.modulecore.ComponentStructuralBuilder");
-		oldBuilders.add("org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver");
-		oldBuilders.add("org.eclipse.wst.common.modulecore.DependencyGraphBuilder");
-		try {
-			J2EEProjectUtilities.removeBuilders(aProject,oldBuilders);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-	}
-
-		public String getFacetFromProject(IProject aProject) {
-			return J2EEProjectUtilities.getJ2EEProjectType(aProject);
-		}
-
-		
-		protected IDataModel setupJavaInstallAction(IProject aProject, boolean existing,String srcFolder) {
-			IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
-			dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			String jVersion = "1.4";
-			IScopeContext context = new ProjectScope( project );
-		    IEclipsePreferences prefs 
-		            = context.getNode( JavaCore.PLUGIN_ID );
-			if (JavaCore.VERSION_1_5.equals(prefs.get(JavaCore.COMPILER_COMPLIANCE,JavaCore.VERSION_1_4))) {
-				jVersion = "5.0";
-			}
-			dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, jVersion); //$NON-NLS-1$
-			if (!existing)
-				dm.setStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, srcFolder); //$NON-NLS-1$
-			return dm;
-		}
-		
-		protected IDataModel setupUtilInstallAction(IProject aProject,String specVersion) {
-			IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
-			aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-			aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
-			aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
-			return aFacetInstallDataModel;
-		}
-		protected IDataModel setupEarInstallAction(IProject aProject,String specVersion) {
-			IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
-			earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-			
-			return earFacetInstallDataModel;
-		}
-		protected IDataModel setupAppClientInstallAction(IProject aProject,String specVersion) {
-			IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
-			aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-			aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
-			aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
-			aFacetInstallDataModel.setBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS,false);
-			return aFacetInstallDataModel;
-		}
-		protected IDataModel setupConnectorInstallAction(IProject aProject,String specVersion) {
-			IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
-			aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-			aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
-			aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
-			return aFacetInstallDataModel;
-		}
-
-		private void addFacets(IProject aProject) {
-			StructureEdit edit = null;
-			try {
-				edit = StructureEdit.getStructureEditForWrite(aProject);
-				if (edit == null) return;  // Not a component project....
-				edit.getModuleStructuralModel().setUseOldFormat(true);
-				if (edit.getComponent() == null) return; // Can't migrate
-				ComponentType type = edit.getComponent().getComponentType();
-				if (type == null) return;  // Can't migrate
-				String compId = type.getComponentTypeId();
-				String specVersion = edit.getComponent().getComponentType().getVersion();
-				moveMetaProperties(edit.getComponent(),type);
-				addFacetsToProject(aProject, compId, specVersion,true);
-			}
-			finally {
-				if (edit != null) {
-					edit.save(null);
-					edit.getModuleStructuralModel().setUseOldFormat(false);
-					edit.dispose();
-				}
-			}
-			
-		}
-
-		private void moveMetaProperties(WorkbenchComponent component, ComponentType type) {
-			List props = type.getProperties();
-			List compProps = component.getProperties();
-			for (Iterator iter = props.iterator(); iter.hasNext();) {
-				Property element = (Property) iter.next();
-				Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
-				newProp.setName(element.getName());
-				newProp.setValue(element.getValue());
-				compProps.add(newProp);
-			}
-			props.clear();
-		}
-
-		private void addFacetsToProject(IProject aProject, String compId, String specVersion,boolean existing) {
-			if (compId.equals(J2EEProjectUtilities.DYNAMIC_WEB))
-				installWEBFacets(aProject,specVersion,existing);
-			else if (compId.equals(J2EEProjectUtilities.EJB))
-				installEJBFacets(aProject,specVersion,existing);
-			else if (compId.equals(J2EEProjectUtilities.APPLICATION_CLIENT))
-				installAppClientFacets(aProject,specVersion,existing);
-			else if (compId.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION))
-				installEARFacets(aProject,specVersion,existing);
-			else if (compId.equals(J2EEProjectUtilities.JCA))
-				installConnectorFacets(aProject,specVersion,existing);
-			else if (compId.equals(J2EEProjectUtilities.UTILITY))
-				installUtilityFacets(aProject,specVersion,existing);
-			else if (compId.equals(J2EEProjectUtilities.STATIC_WEB))
-				installStaticWebFacets(aProject,specVersion,existing);
-		}
-
-		private void installStaticWebFacets(IProject project2, String specVersion, boolean existing) {
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project2.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			//facetDMs.add(setupJavaInstallAction(webProj,existing,CreationConstants.DEFAULT_WEB_SOURCE_FOLDER));
-			IDataModel newModel = setupStaticWebInstallAction(project2);
-			facetDMs.add(newModel);
-			//setRuntime(webProj,dm); //Setting runtime property
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			}
-		}
-
-		private IDataModel setupStaticWebInstallAction(IProject project2) {
-			IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
-			webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project2.getName());
-			webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0");
-			
-			return webFacetInstallDataModel;
-		}
-
-		private void installUtilityFacets(IProject aProject, String specVersion, boolean existing) {
-			replaceDeployablesOutputIfNecessary(project);
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			facetDMs.add(setupJavaInstallAction(aProject,existing,"src"));
-			IDataModel newModel = setupUtilInstallAction(aProject,specVersion);
-			facetDMs.add(newModel);
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			}
-			
-		}
-
-		private void installConnectorFacets(IProject aProject, String specVersion, boolean existing) {
-			replaceDeployablesOutputIfNecessary(project);
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			facetDMs.add(setupJavaInstallAction(aProject,existing,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.JCA_CONTENT_FOLDER)));
-			IDataModel newModel = setupConnectorInstallAction(aProject,specVersion);
-			facetDMs.add(newModel);
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			}
-			
-		}
-
-		private void installEARFacets(IProject aProject, String specVersion, boolean existing) {
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			IDataModel newModel = setupEarInstallAction(aProject,specVersion);
-			facetDMs.add(newModel);
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			}
-			
-		}
-
-		private void installAppClientFacets(IProject aProject, String specVersion, boolean existing) {
-			replaceDeployablesOutputIfNecessary(project);
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			facetDMs.add(setupJavaInstallAction(aProject,existing,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APP_CLIENT_CONTENT_FOLDER)));
-			IDataModel newModel = setupAppClientInstallAction(aProject,specVersion);
-			facetDMs.add(newModel);
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			}
-			
-		}
-
-		private void installEJBFacets(IProject ejbProject2,String ejbVersion, boolean existing) {
-			replaceDeployablesOutputIfNecessary(project);
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, ejbProject2.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			facetDMs.add(setupJavaInstallAction(ejbProject2,existing,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER)));
-			IDataModel newModel = setupEjbInstallAction(ejbProject2,ejbVersion,existing);
-			facetDMs.add(newModel);
-			//setRuntime(ejbProject2,dm); //Setting runtime property
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			}
-			
-		}
-		private void installWEBFacets(IProject webProj,String specVersion, boolean existing) {
-			removeOldWebContainerIfNecessary(project);
-			replaceDeployablesOutputIfNecessary(project);
-			
-			IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
-			dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, webProj.getName());
-			FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
-			facetDMs.add(setupJavaInstallAction(webProj,existing, CommonFrameworksPlugin.getDefault().getPluginPreferences().getString(CommonFrameworksPlugin.DEFAULT_SOURCE_FOLDER)));
-			IDataModel newModel = setupWebInstallAction(webProj,specVersion);
-			facetDMs.add(newModel);
-			//setRuntime(webProj,dm); //Setting runtime property
-			try {
-				/**
-				 * Warning cleanup 12/07/2005
-				 */
-				//IStatus stat =  dm.getDefaultOperation().execute(null,null);
-				dm.getDefaultOperation().execute(null,null);
-			} catch (ExecutionException e) {
-				Throwable realException = e.getCause();
-				if (realException != null && realException instanceof CoreException) {
-					IStatus st = ((CoreException)realException).getStatus();
-					if (st != null)
-						System.out.println(st);
-					realException.printStackTrace();
-				}
-			} catch (Exception ex) {
-				if (ex != null && ex instanceof CoreException) {
-					IStatus st = ((CoreException)ex).getStatus();
-					if (st != null)
-						System.out.println(st);
-					ex.printStackTrace();
-				}
-			}
-			
-			
-		}
-		private void replaceDeployablesOutputIfNecessary(IProject proj) {
-
-
-			IJavaProject jproj = JemProjectUtilities.getJavaProject(proj);
-			final IClasspathEntry[] current;
-			boolean deployablesFound = false;
-			try {
-				current = jproj.getRawClasspath();
-				List updatedList = new ArrayList();
-				IPath sourcePath = null;
-				for (int i = 0; i < current.length; i++) {
-					IClasspathEntry entry = current[i];
-					if ((entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) && (entry.getOutputLocation() != null && entry.getOutputLocation().toString().indexOf(OLD_DEPLOYABLES_PATH) != -1)) {
-						sourcePath = entry.getPath();
-						updatedList.add(JavaCore.newSourceEntry(sourcePath));
-						deployablesFound = true;
-					}
-					else
-						updatedList.add(entry);
-				}
-				if (deployablesFound) {
-					IClasspathEntry[] updated = (IClasspathEntry[])updatedList.toArray(new IClasspathEntry[updatedList.size()]);
-					jproj.setRawClasspath(updated, null);
-					jproj.save(null, true);
-				}
-			} catch (JavaModelException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			
-		
-			
-		}
-
-		private void removeOldWebContainerIfNecessary(IProject webProj) {
-
-			IJavaProject jproj = JemProjectUtilities.getJavaProject(webProj);
-			final IClasspathEntry[] current;
-			try {
-				current = jproj.getRawClasspath();
-				List updatedList = new ArrayList();
-				boolean useDefaultWebAppLibraries = J2EEComponentClasspathContainerUtils.getDefaultUseWebAppLibraries();
-				for (int i = 0; i < current.length; i++) {
-					IClasspathEntry entry = current[i];
-					// the web container is added to the classpath if:
-					// 1. they don't have an entry for WEB_LIB_CONTAINER AND
-					// 2. they have an entry for WEB_LIB_PATH BUT
-					// they do not have the preference checked to use the Web App classpath container
-					if ((entry.getPath().toString().indexOf(WEB_LIB_CONTAINER) == -1) && 
-							((entry.getPath().toString().indexOf(WEB_LIB_PATH) == -1) || !useDefaultWebAppLibraries))
-						updatedList.add(entry);
-				}
-				IClasspathEntry[] updated = (IClasspathEntry[])updatedList.toArray(new IClasspathEntry[updatedList.size()]);
-				jproj.setRawClasspath(updated, null);
-				jproj.save(null, true);
-			} catch (JavaModelException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			
-		}
-
-		protected IRuntime getRuntimeByID(String id) {
-			IRuntime[] targets = ServerUtil.getRuntimes("", "");
-			for (int i = 0; i < targets.length; i++) {
-				IRuntime target = targets[i];
-				if (id.equals(target.getId()))
-					return target;
-			}
-			return null;
-		}
-
-		protected IDataModel setupEjbInstallAction(IProject aProject,String ejbVersion, boolean existing) {
-			IDataModel ejbFacetInstallDataModel = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
-			ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, ejbVersion);
-			ejbFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
-			ejbFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
-			if (!existing)
-				ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CONFIG_FOLDER, J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER));
-			return ejbFacetInstallDataModel;
-		}
-
-		protected IDataModel setupWebInstallAction(IProject aProject,String specVersion) {
-			IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
-			webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
-			webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-			webFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
-			webFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
-			return webFacetInstallDataModel;
-		}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
deleted file mode 100644
index 31d0c7997..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
+++ /dev/null
@@ -1,237 +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 implementation as prop page heirarchy
- * rfrost@bea.com - conversion to single property page impl
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Primary project property page for J2EE dependencies; content is dynamically 
- * generated based on the project facets and will be comprised by a
- * set of IJ2EEDependenciesControl implementations.
- */
-public class J2EEDependenciesPage extends PropertyPage {
-	
-	public String DESCRIPTION = J2EEUIMessages.getResourceString("DESCRIPTION"); //$NON-NLS-1$
-
-	private IProject project;
-	private IJ2EEDependenciesControl[] controls = new IJ2EEDependenciesControl[0];
-	
-	public J2EEDependenciesPage() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		
-		// Need to find out what type of project we are handling
-		project = (IProject) getElement().getAdapter(IResource.class);
-		boolean isEAR = false;
-		boolean isWEB = false;
-		try {
-			final IFacetedProject facetedProject = ProjectFacetsManager.create(project);
-			if (facetedProject == null) {
-				return getFacetErrorComposite(parent);
-			}
-			isEAR = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE)); 
-			isWEB = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
-		} catch (CoreException ce) {
-			return getFacetErrorComposite(parent);
-		}
-		
-		if (isEAR) {
-			return createEARContent(parent);
-		} else if (isWEB) {
-			return createWebContent(parent);
-		} else {
-			return createNonEARContent(parent);
-		}
-	}
-	
-	private Composite getFacetErrorComposite(final Composite parent) {
-		final String errorCheckingFacet = ManifestUIResourceHandler.Error_Checking_Project_Facets;
-		setErrorMessage(errorCheckingFacet);
-		setValid(false);
-		return getErrorComposite(parent, errorCheckingFacet);		
-	}
-	
-	private Composite getErrorComposite(final Composite parent, final String error) {
-		final Composite composite = new Composite(parent, SWT.NONE);
-		final GridLayout layout = new GridLayout();
-        layout.marginWidth = 0;
-        layout.marginWidth = 0;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		final Label label= new Label(composite, SWT.NONE);
-		label.setText(error);
-		return composite;
-	}
-	
-	private Composite createEARContent(final Composite parent) {
-		controls = new IJ2EEDependenciesControl[1];
-		controls[0] = new AddModulestoEARPropertiesPage(project, this);
-		return controls[0].createContents(parent);
-	}
-	
-	private Composite createWebContent(final Composite parent) {
-		final boolean standalone = J2EEProjectUtilities.isStandaloneProject(project);
-		
-		if (standalone) {
-			// only need to create the Web Libraries page
-			controls = new IJ2EEDependenciesControl[1];
-			controls[0] = new WebLibDependencyPropertiesPage(project, this);
-			return controls[0].createContents(parent);
-		} else {
-			// Create a tabbed folder with both "J2EE Modules" and "Web Libraries"
-			final TabFolder folder = new TabFolder(parent, SWT.LEFT);
-			folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-			folder.setFont(parent.getFont());
-
-			// Create the two tabs 
-			controls = new IJ2EEDependenciesControl[2];
-		
-			controls[0] = new JARDependencyPropertiesPage(project, this);
-			TabItem tab = new TabItem(folder, SWT.NONE);
-			tab.setControl(controls[0].createContents(folder));
-			tab.setText(ManifestUIResourceHandler.J2EE_Modules);
-			controls[1] = new WebLibDependencyPropertiesPage(project, this);		
-			tab = new TabItem(folder, SWT.NONE);
-			tab.setControl(controls[1].createContents(folder));
-			tab.setText(ManifestUIResourceHandler.Web_Libraries);
-		
-			folder.setSelection(0);
-			return folder;
-		}
-	}
-	
-	private Composite createNonEARContent(final Composite parent) {
-		controls = new IJ2EEDependenciesControl[1];
-		final boolean standalone = J2EEProjectUtilities.isStandaloneProject(project);
-		if (standalone) {
-			// if not referenced by an EAR, check if referenced by a dynamic web project
-			if (J2EEProjectUtilities.getReferencingWebProjects(project).length > 0) {
-				controls[0] = new WebRefDependencyPropertiesPage(project, this);
-			} else {
-				return getUnreferencedErrorComposite(parent);
-			}
-		} else { 
-			controls[0] = new JARDependencyPropertiesPage(project, this);			
-		}
-
-		return controls[0].createContents(parent);
-	}
-	
-	private Composite getUnreferencedErrorComposite(final Composite parent) {
-		final String msg = ManifestUIResourceHandler.Unreferenced_Module_Error;
-		setErrorMessage(msg);
-		return getErrorComposite(parent, msg);		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		for (int i = 0; i < controls.length; i++) {
-			if (controls[i] != null) {
-				if (!controls[i].performOk()) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	public void performDefaults() {
-		for (int i = 0; i < controls.length; i++) {
-			if (controls[i] != null) {
-				controls[i].performDefaults();
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performCancel()
-	 */
-	public boolean performCancel() {
-		for (int i = 0; i < controls.length; i++) {
-			if (controls[i] != null) {
-				if (!controls[i].performCancel()) {
-					return false;
-				}
-			}
-		}
-		return super.performCancel();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		for (int i = 0; i < controls.length; i++) {
-			if (controls[i] != null) {
-				controls[i].setVisible(visible);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		for (int i = 0; i < controls.length; i++) {
-			if(controls[i] != null){
-				controls[i].dispose();
-			}
-		}
-	}
-
-	protected static void createDescriptionComposite(final Composite parent, final String description) {
-		Composite descriptionComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		descriptionComp.setLayout(layout);
-		descriptionComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fillDescription(descriptionComp, description);
-	}
-	
-	private static void fillDescription(Composite c, String s) {
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 250;
-		Text text = new Text(c, SWT.READ_ONLY | SWT.WRAP);
-		text.setLayoutData(data);
-		text.setText(s);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java
deleted file mode 100644
index ddfb3eec6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Apr 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-/**
- * @author vijayb
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface J2EEPropertiesConstants {
-	//J2EEUIMessages.getResourceString("Import_Classes");
-	public String J2EE_LEVEL = J2EEUIMessages.getResourceString("J2EE_Level"); //$NON-NLS-1$
-	public String J2EE_12 = J2EEUIMessages.getResourceString("J2EE_12"); //$NON-NLS-1$
-	public String J2EE_12_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_12_DESCRIPTION"); //$NON-NLS-1$
-	public String J2EE_13 = J2EEUIMessages.getResourceString("J2EE_13"); //$NON-NLS-1$
-	public String J2EE_13_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_13_DESCRIPTION"); //$NON-NLS-1$
-	public String J2EE_14_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_14_DESCRIPTION"); //$NON-NLS-1$
-	public String EJB_LEVEL = J2EEUIMessages.getResourceString("EJB_LEVEL"); //$NON-NLS-1$
-	public String EJB_11 = J2EEUIMessages.getResourceString("EJB_11"); //$NON-NLS-1$
-	public String EJB_11_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_11_DESCRIPTION"); //$NON-NLS-1$
-	public String EJB_20 = J2EEUIMessages.getResourceString("EJB_20"); //$NON-NLS-1$
-	public String EJB_20_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_20_DESCRIPTION"); //$NON-NLS-1$
-	public String EJB_21_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_21_DESCRIPTION"); //$NON-NLS-1$
-	public String CONNECTOR_LEVEL = J2EEUIMessages.getResourceString("CONNECTOR_LEVEL"); //$NON-NLS-1$
-	public String CONNECTOR_10 = J2EEUIMessages.getResourceString("CONNECTOR_10"); //$NON-NLS-1$
-	public String CONNECTOR_15 = J2EEUIMessages.getResourceString("CONNECTOR_15"); //$NON-NLS-1$
-	public String CONNECTOR_10_DESCRIPTION = J2EEUIMessages.getResourceString("CONNECTOR_10_DESCRIPTION"); //$NON-NLS-1$
-	public String CONNECTOR_15_DESCRIPTION = J2EEUIMessages.getResourceString("CONNECTOR_15_DESCRIPTION"); //$NON-NLS-1$
-	public String WEB_LEVEL = J2EEUIMessages.getResourceString("WEB_LEVEL"); //$NON-NLS-1$
-	public String WEB_22_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_22_DESCRIPTION"); //$NON-NLS-1$
-	public String WEB_23_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_23_DESCRIPTION"); //$NON-NLS-1$
-	public String WEB_24_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_24_DESCRIPTION"); //$NON-NLS-1$
-	public String APP_CLIENT_LEVEL = J2EEUIMessages.getResourceString("APP_CLIENT_LEVEL"); //$NON-NLS-1$
-	public String APP_CLIENT_12_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_12_DESCRIPTION"); //$NON-NLS-1$
-	public String APP_CLIENT_13_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_13_DESCRIPTION"); //$NON-NLS-1$
-	public String APP_CLIENT_14_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_14_DESCRIPTION"); //$NON-NLS-1$
-	public String DESCRIPTION = J2EEUIMessages.getResourceString("DESCRIPTION"); //$NON-NLS-1$
-	public String WEB_CONTEXT_ROOT = J2EEUIMessages.getResourceString("WEB_CONTEXT_ROOT"); //$NON-NLS-1$
-	public String WEB_CONTENT_FOLDER_NAME = J2EEUIMessages.getResourceString("WEB_CONTENT_FOLDER_NAME"); //$NON-NLS-1$
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
deleted file mode 100644
index bdcab2f56..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
+++ /dev/null
@@ -1,1099 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *     Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelEvent;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelListener;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener;
-import org.eclipse.jst.j2ee.internal.listeners.ValidateEditListener;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.builder.DependencyGraphManager;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation;
-
-/**
- * @author jialin
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class JARDependencyPropertiesPage implements IJ2EEDependenciesControl, IClasspathTableOwner, Listener, ClasspathModelListener, IElementChangedListener {
-
-	protected final IProject project;
-	protected final J2EEDependenciesPage propPage;
-	protected IOException caughtManifestException;
-	protected boolean isDirty;
-	protected Text classPathText;
-	protected Text componentNameText;
-	protected ClasspathModel model;
-	protected CCombo availableAppsCombo;
-	protected ClasspathTableManager tableManager;
-	protected IValidateEditListener validateEditListener;
-	protected Label manifestLabel;
-	protected Label enterpriseApplicationLabel;
-	protected Label availableDependentJars;
-	private final Display display;
-	private boolean isDisposed = false;
-	
-	/**
-	 * Constructor for JARDependencyPropertiesControl
-	 */
-	public JARDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
-		super();
-		J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
-		this.project = project;
-		this.propPage = page;
-		this.display = propPage.getShell().getDisplay();
-	}
-
-	/**
-	 * Returns false if page should not be displayed for the project.
-	 */
-	protected void initialize() {
-		model = createClasspathModel();
-		model.setProject(project);
-		if (model.getComponent() != null) {
-			model.addListener(this);
-			updateModelManifest();
-			initializeValidateEditListener();
-		}
-	}
-
-	protected ClasspathModel createClasspathModel(){
-		return new ClasspathModel(null, false);
-	}
-
-	public void dispose() {
-		isDisposed = true;
-		JavaCore.removeElementChangedListener(this);
-		J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
-	}
-
-	private void updateModelManifest() {
-		if (JemProjectUtilities.isBinaryProject(project) || model.getAvailableEARComponents().length == 0)
-			return;
-		
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		if(component != null){
-			IVirtualFile vManifest = component.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
-			if(vManifest.exists()){
-				IFile iManifest = vManifest.getUnderlyingFile();
-				if(iManifest != null && iManifest.exists()){
-					InputStream in = null;
-					try {
-						in = iManifest.getContents();
-						ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
-						model.primSetManifest(mf);
-					} catch (CoreException e) {
-						Logger.getLogger().logError(e);
-						model.primSetManifest(new ArchiveManifestImpl());
-					} catch (IOException iox) {
-						Logger.getLogger().logError(iox);
-						model.primSetManifest(new ArchiveManifestImpl());
-						caughtManifestException = iox;
-					} finally {
-						if (in != null) {
-							try {
-								in.close();
-							} catch (IOException weTried) {
-								// Ignore
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	protected void initializeValidateEditListener() {
-		validateEditListener = new ValidateEditListener(null, model);
-		validateEditListener.setShell(propPage.getShell());
-	}
-
-	public void setVisible(boolean visible) {
-		if (visible) {
-			if (caughtManifestException != null && !model.isDirty()) {
-				ManifestErrorPrompter.showManifestException(propPage.getShell(), ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE, false, caughtManifestException);
-			}
-		}
-	}
-
-	/**
-	 * Refreshes the ClasspathModel if the project classpath is changed.
-	 */
-	public void elementChanged(final ElementChangedEvent event) {
-		if (event.getType() == ElementChangedEvent.POST_CHANGE && classpathChanged(event.getDelta())) {
-			// trigger a recomputation and refresh for the currently selected EAR
-			if (!isDisposed) {
-				display.asyncExec (new Runnable () {
-					public void run () {
-						if (!isDisposed) {
-							handleClasspathChange();
-						}
-					}
-				});
-			}
-		}
-	}
-	
-	/**
-	 * Called to refresh the UI when the classpath changes
-	 */
-	protected void handleClasspathChange() {
-		model.resetClassPathSelection();
-		refresh();		
-	}
-	
-	private boolean classpathChanged(final IJavaElementDelta delta) {
-		final int kind = delta.getKind();
-		if (kind == IJavaElementDelta.CHANGED) {
-			final int flags = delta.getFlags();
-			final IJavaElement element = delta.getElement();
-			if (element instanceof IJavaModel) {
-				if ((flags & IJavaElementDelta.F_CHILDREN) == IJavaElementDelta.F_CHILDREN) {
-					final IJavaElementDelta[] children = delta.getChangedChildren();
-					for (int i = 0; i < children.length; i++) {
-						// check all of the IJavaProject children
-						if (classpathChanged(children[i])) {
-							return true;
-						}
-					}
-				}
-			} else if (element instanceof IJavaProject) {
-				// check if we either have a direct indication of a classpath change or a delta on the
-				// .classpath file (changes to classpath entry attributes only give us this...)
-				final IJavaProject jproject = (IJavaProject) element;
-				final IProject eventProject = jproject.getProject();
-				if (eventProject.equals(project)) {
-					if ((flags & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0) {
-						return true; 	
-					}
-					final IResourceDelta[] deltas = delta.getResourceDeltas();
-					if (deltas != null) {
-						for (int i = 0; i < deltas.length; i++) {
-							if (deltas[i].getProjectRelativePath().toString().equals(".classpath")) { //$NON-NLS-1$
-								return true;
-							}
-						}
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	public Composite createContents(Composite parent) {
-		initialize();
-		Composite composite = createBasicComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		if (model.getComponent() != null) {
-			if (!isValidComponent())
-				return composite;
-			J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.J2EE_Modules_Desc);
-			createProjectLabelsGroup(composite);
-			createListGroup(composite);
-			createTextGroup(composite);
-			refresh();
-		}
-	    Dialog.applyDialogFont(parent);
-	    postCreateContents();
-		return composite;
-	}
-
-	/**
-	 * Called at the end of createContents().
-	 */
-	protected void postCreateContents() {
-		// register this object as an IElementChangedListener so that it will react to user changes to the Java build path
-		JavaCore.addElementChangedListener(this);	
-	}
-	
-	/**
-	 * @param comp
-	 * @return
-	 */
-	protected Composite createBasicComposite(Composite comp) {
-		Composite composite = new Composite(comp, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		return composite;
-	}
-
-	protected boolean isValidComponent() {
-		if (J2EEProjectUtilities.isEARProject(project)) {
-			propPage.setErrorMessage(ManifestUIResourceHandler.EAR_Module_Dep_Error);
-			return false;
-		} else if (J2EEProjectUtilities.isStandaloneProject(model.getComponent().getProject())) {
-			propPage.setErrorMessage(ClasspathModel.NO_EAR_MESSAGE);
-			return false;
-		}
-		return true;
-	}
-
-	protected void createProjectLabelsGroup(Composite parent) {
-
-		Composite labelsGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		labelsGroup.setLayout(layout);
-		labelsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		/*
-		 * Label label = new Label(labelsGroup, SWT.NONE);
-		 * label.setText(ManifestUIResourceHandler.Project_name__UI_);
-		 * 
-		 * componentNameText = new Text(labelsGroup, SWT.BORDER); GridData data = new
-		 * GridData(GridData.FILL_HORIZONTAL); componentNameText.setEditable(false);
-		 * componentNameText.setLayoutData(data); componentNameText.setText(project.getName());
-		 */
-
-		createEnterpriseAppsControls(labelsGroup);
-
-	}
-
-	private void createEnterpriseAppsControls(Composite labelsGroup) {
-
-		enterpriseApplicationLabel = new Label(labelsGroup, SWT.NONE);
-		enterpriseApplicationLabel.setText(ManifestUIResourceHandler.EAR_Project_Name__UI__UI_);
-
-		availableAppsCombo = new CCombo(labelsGroup, SWT.READ_ONLY | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		availableAppsCombo.setLayoutData(gd);
-
-		availableAppsCombo.addListener(SWT.Selection, this);
-
-	}
-
-	protected void createListGroup(Composite parent) {
-		Composite listGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		listGroup.setLayout(layout);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		gData.horizontalIndent = 5;
-		listGroup.setLayoutData(gData);
-
-		availableDependentJars = new Label(listGroup, SWT.NONE);
-		gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		availableDependentJars.setText(ManifestUIResourceHandler.Available_dependent_JARs__UI_);
-		availableDependentJars.setLayoutData(gData);
-		createTableComposite(listGroup);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.j2ee.common.ui.classpath.IClasspathTableOwner#createGroup(org.eclipse.swt.widgets.Composite)
-	 */
-	public Group createGroup(Composite parent) {
-		return new Group(parent, SWT.NULL);
-	}
-
-	protected void createTextGroup(Composite parent) {
-
-		Composite textGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		textGroup.setLayout(layout);
-		textGroup.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL));
-
-		createClassPathText(textGroup);
-
-	}
-
-	protected void createClassPathText(Composite textGroup) {
-
-		manifestLabel = new Label(textGroup, SWT.NONE);
-		manifestLabel.setText(ManifestUIResourceHandler.Manifest_Class_Path__UI_);
-
-		classPathText = new Text(textGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		gData.widthHint = 400;
-		gData.heightHint = 100;
-		classPathText.setLayoutData(gData);
-		classPathText.setEditable(false);
-	}
-
-	protected void createTableComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(gData);
-		tableManager = new ClasspathTableManager(this, model, validateEditListener);
-		tableManager.fillComposite(composite);
-	}
-
-	/**
-	 * @see IClasspathTableOwner#createAvailableJARsViewer(Composite)
-	 */
-	public CheckboxTableViewer createAvailableJARsViewer(Composite parent) {
-		int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
-		Table table = new Table(parent, flags);
-		CheckboxTableViewer availableJARsViewer = new CheckboxTableViewer(table);
-
-		// set up table layout
-		TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
-		tableLayout.addColumnData(new ColumnWeightData(200, true));
-		tableLayout.addColumnData(new ColumnWeightData(200, true));
-		table.setLayout(tableLayout);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		
-		// do not create sorter otherwise order will go wrong
-		//availableJARsViewer.setSorter(new ViewerSorter());
-		
-		// table columns
-		TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0);
-		fileNameColumn.setText(ManifestUIResourceHandler.JAR_Module_UI_);
-		fileNameColumn.setResizable(true);
-
-		TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1);
-		projectColumn.setText(ManifestUIResourceHandler.Project_UI_);
-		projectColumn.setResizable(true);
-		tableLayout.layout(table, true);
-		return availableJARsViewer;
-
-	}
-
-	/**
-	 * @see IClasspathTableOwner#createButtonColumnComposite(Composite)
-	 */
-	public Composite createButtonColumnComposite(Composite parent) {
-		Composite buttonColumn = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonColumn.setLayout(layout);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		buttonColumn.setLayoutData(data);
-		return buttonColumn;
-	}
-
-	/**
-	 * @see IClasspathTableOwner
-	 */
-	public Button primCreatePushButton(String label, Composite buttonColumn) {
-		Button aButton = new Button(buttonColumn, SWT.PUSH);
-		aButton.setText(label);
-		return aButton;
-	}
-
-	/**
-	 * @see IClasspathTableOwner
-	 */
-	public Button primCreateRadioButton(String label, Composite parent) {
-		Button aButton = new Button(parent, SWT.RADIO);
-		aButton.setText(label);
-		return aButton;
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == availableAppsCombo)
-			availableAppsSelected(event);
-	}
-
-	protected void availableAppsSelected(Event event) {
-		int index = availableAppsCombo.getSelectionIndex();
-		model.selectEAR(index);
-	}
-
-	protected void populateApps() {
-		IVirtualComponent[] components = model.getAvailableEARComponents();
-		String[] values = new String[components.length];
-		for (int i = 0; i < components.length; i++) {
-			values[i] = components[i].getProject().getName();
-		}
-		if (availableAppsCombo != null) {
-			availableAppsCombo.setItems(values);
-			IVirtualComponent selected = model.getSelectedEARComponent();
-			if (selected != null) {
-				int index = Arrays.asList(components).indexOf(selected);
-				availableAppsCombo.select(index);
-			} else
-				availableAppsCombo.clearSelection();
-		}
-	}
-
-	protected void refresh() {
-		populateApps();
-		if (tableManager != null) {
-			tableManager.refresh();
-		}
-		refreshText();
-	}
-
-
-	public void refreshText() {
-		ClassPathSelection sel = model.getClassPathSelection();
-		if (sel != null && classPathText != null)
-			classPathText.setText(sel == null ? "" : sel.toString()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ClasspathModelListener#modelChanged(ClasspathModelEvent)
-	 */
-	public void modelChanged(ClasspathModelEvent evt) {
-		if (evt.getEventType() == ClasspathModelEvent.CLASS_PATH_CHANGED) {
-			isDirty = true;
-			refreshText();
-		} else if (evt.getEventType() == ClasspathModelEvent.EAR_PROJECT_CHANGED) {			
-			tableManager.refresh();
-		}
-	}
-
-	public void performDefaults() {
-		model.resetClassPathSelection();
-		refresh();
-		isDirty = false;
-		model.dispose();
-	}
-
-	public boolean performCancel() {
-		model.dispose();
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		if (!isDirty)
-			return true;
-		modifyEARBundledLibs();		
-		WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createManifestOperation());
-		createClasspathAttributeUpdateOperation(composed, model.getClassPathSelection(), false);
-		try {
-			new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
-		} catch (InvocationTargetException ex) {
-			String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
-			String msg = title;
-			if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
-				msg = ex.getTargetException().getMessage();
-			MessageDialog.openError(propPage.getShell(), title, msg);
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-			return false;
-		} catch (InterruptedException e) {
-			// cancelled
-			return false;
-		} finally {
-			model.dispose();
-		}
-		isDirty = false;
-		return true;
-	}
-
-	List getUnSelectedClassPathElementsForJ2EEDependency() {
-		List unselectedForJ2EE = getUnSelectedClassPathSelection().getClasspathElements();
-
-		List unselected = new ArrayList();
-		if (model != null && model.getClassPathSelectionForWLPs() != null) {
-			List wlpSelected = model.getClassPathSelectionForWLPs().getSelectedClasspathElements();
-
-			java.util.Iterator it = unselectedForJ2EE.iterator();
-
-			while (it.hasNext()) {
-				ClasspathElement element = (ClasspathElement) it.next();
-				java.util.Iterator wlpIterator = wlpSelected.iterator();
-				boolean found = false;
-				while (wlpIterator.hasNext()) {
-					ClasspathElement wlpElement = (ClasspathElement) wlpIterator.next();
-					String text = element.getText();
-					int index = text.indexOf(".jar");
-					if (index != -1) {
-						text = text.substring(0, index);
-						if (text.equals(wlpElement.getText())) {
-							found = true;
-							break;
-						}
-					}
-				}
-				if (!found) {
-					if (!unselected.contains(element))
-						unselected.add(element);
-				}
-
-			}
-		}
-		return unselected;
-	}
-
-
-	/**
-	 * @deprecated don't use this method it will be deleted
-	 * @return
-	 */
-	List getUnSelectedClassPathElementsForWebDependency() {
-		List unselectedForWLP = getUnSelectedClassPathSelectionForWLPs().getClasspathElements();
-		List unselected = new ArrayList();
-		if (model != null && model.getClassPathSelection() != null) {
-			List j2eeSelected = model.getClassPathSelection().getSelectedClasspathElements();
-			java.util.Iterator it = unselectedForWLP.iterator();
-
-			while (it.hasNext()) {
-				ClasspathElement element = (ClasspathElement) it.next();
-				java.util.Iterator j2eeIterator = j2eeSelected.iterator();
-				boolean found = false;
-				while (j2eeIterator.hasNext()) {
-					ClasspathElement j2eeElement = (ClasspathElement) j2eeIterator.next();
-					String text = j2eeElement.getText();
-					int index = text.indexOf(".jar");
-					if( index != -1 ){
-						text = text.substring(0, index);
-						if (element.getText().equals(text)) {
-							found = true;
-							break;
-						}
-					}
-				}
-				if (!found) {
-					if (!unselected.contains(element))
-						unselected.add(element);
-				}
-
-			}
-		} else {
-			unselected = unselectedForWLP;
-		}
-		return unselected;
-	}
-
-	/**
-	 * DoNotUseMeThisWillBeDeletedPost15
-	 * @return
-	 */
-	protected WorkspaceModifyComposedOperation createJ2EEComponentDependencyOperations() {
-		WorkspaceModifyComposedOperation composedOp = null;
-		List selected = getSelectedClassPathSelection().getClasspathElements();
-		List unselected = getUnSelectedClassPathElementsForJ2EEDependency();
-
-		List targetComponentsHandles = new ArrayList();
-		for (int i = 0; i < selected.size(); i++) {
-			ClasspathElement element = (ClasspathElement) selected.get(i);
-			IVirtualComponent component = element.getComponent();
-			if (null != component) {
-				targetComponentsHandles.add(component);
-			}
-		}
-		if (!targetComponentsHandles.isEmpty()) {
-			composedOp = new WorkspaceModifyComposedOperation();
-			composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.createReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
-		}
-		targetComponentsHandles = new ArrayList();
-		for (int i = 0; i < unselected.size(); i++) {
-			ClasspathElement element = (ClasspathElement) unselected.get(i);
-			IProject elementProject = element.getProject();
-			if (elementProject != null) {
-				if (ModuleCoreNature.isFlexibleProject(elementProject)) {
-					IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
-					targetComponentsHandles.add(targetComp);
-				}
-			} else {
-				URI archiveURI = element.getArchiveURI();
-				if (archiveURI != null && !archiveURI.equals("")) { //$NON-NLS-1$
-					String name = ""; //$NON-NLS-1$
-					try {
-						String type = ModuleURIUtil.getArchiveType(archiveURI);
-						String tmpname = ModuleURIUtil.getArchiveName(archiveURI);
-						name = type + IPath.SEPARATOR + tmpname;
-					} catch (UnresolveableURIException e) {
-						Logger.getLogger().logError(e.getMessage());
-					}
-					if (!name.equals("")) { //$NON-NLS-1$
-						IVirtualReference ref = model.getComponent().getReference(name);
-						if (ref != null) {
-							IVirtualComponent referenced = ref.getReferencedComponent();
-							targetComponentsHandles.add(referenced);
-						}
-					}
-				}
-			}
-		}
-		if (!targetComponentsHandles.isEmpty()) {
-			if (composedOp == null)
-				composedOp = new WorkspaceModifyComposedOperation();
-			composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.removeReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
-		}
-		return composedOp;
-	}
-
-
-	/**
-	 * This should be moved to the {@link WebLibDependencyPropertiesPage} because it is only used there.
-	 * @return
-	 */
-	protected WorkspaceModifyComposedOperation createComponentDependencyOperations() {
-		WorkspaceModifyComposedOperation composedOp = null;
-		final ClassPathSelection selectedWLPs = getSelectedClassPathSelectionForWLPs();
-		List selected = selectedWLPs.getClasspathElements();
-		List unselected = getUnSelectedClassPathSelectionForWLPs().getClasspathElements();
-
-		List targetComponentsHandles = new ArrayList();
-		for (int i = 0; i < selected.size(); i++) {
-			ClasspathElement element = (ClasspathElement) selected.get(i);
-			if (element.isClasspathDependency() || element.isClasspathEntry()) {
-				continue;
-			}
-			IProject elementProject = element.getProject();
-			if (elementProject != null) {
-				IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
-				targetComponentsHandles.add(targetComp);
-			}
-		}
-		if (!targetComponentsHandles.isEmpty()) {
-			composedOp = new WorkspaceModifyComposedOperation();
-			composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.createWLPReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
-		}
-		targetComponentsHandles = new ArrayList();
-		for (int i = 0; i < unselected.size(); i++) {
-			ClasspathElement element = (ClasspathElement) unselected.get(i);
-			if (element.isClasspathDependency() || element.isClasspathEntry()) {
-				continue;
-			}
-			IProject elementProject = element.getProject();
-			if (elementProject != null) {
-				if (ModuleCoreNature.isFlexibleProject(elementProject)) {
-					IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
-					targetComponentsHandles.add(targetComp);
-				}
-			} else {
-				URI archiveURI = element.getArchiveURI();
-				if (archiveURI != null && !archiveURI.equals("")) { //$NON-NLS-1$
-					String name = ""; //$NON-NLS-1$
-					try {
-						String type = ModuleURIUtil.getArchiveType(archiveURI);
-						String tmpname = ModuleURIUtil.getArchiveName(archiveURI);
-						name = type + IPath.SEPARATOR + tmpname;
-					} catch (UnresolveableURIException e) {
-						Logger.getLogger().logError(e.getMessage());
-					}
-					if (!name.equals("")) { //$NON-NLS-1$
-						IVirtualReference ref = model.getComponent().getReference(name);
-						IVirtualComponent referenced = ref.getReferencedComponent();
-						targetComponentsHandles.add(referenced);
-					}
-				}
-			}
-		}
-		if (!targetComponentsHandles.isEmpty()) {
-			if (composedOp == null) {
-				composedOp = new WorkspaceModifyComposedOperation();
-			}
-			composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.removeWLPReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
-		}
-
-		if (composedOp == null) {
-			composedOp = new WorkspaceModifyComposedOperation();
-		}
-		createClasspathAttributeUpdateOperation(composedOp, model.getClassPathSelectionForWLPs(), true);
-		
-		return composedOp;
-	}
-
-	protected WorkspaceModifyComposedOperation createFlexProjectOperations() {
-		WorkspaceModifyComposedOperation composedOp = null;
-		Object[] elements = tableManager.availableJARsViewer.getCheckedElements();
-		for (int i = 0; i < elements.length; i++) {
-			ClasspathElement element = (ClasspathElement) elements[i];
-			IProject elementProject = element.getProject();
-			try {
-				if (elementProject != null && !elementProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
-					if (composedOp == null) {
-						composedOp = new WorkspaceModifyComposedOperation();
-					}
-					composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(elementProject, false)));
-				}
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-		return composedOp;
-	}
-
-	protected ClassPathSelection getUnSelectedClassPathSelectionForWLPs() {
-		ClassPathSelection selection = new ClassPathSelection();
-		Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
-		List modelElements = model.getClassPathSelectionForWLPs().getClasspathElements();
-		for (int i = 0; i < modelElements.size(); i++) {
-			List checkedElementsList = Arrays.asList(checkedElements);
-			if (!checkedElementsList.contains(modelElements.get(i))) {
-				selection.getClasspathElements().add(modelElements.get(i));
-			}
-		}
-		return selection;
-	}
-
-	private ClassPathSelection getSelectedClassPathSelection() {
-		ClassPathSelection selection = new ClassPathSelection();
-		Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
-		for (int i = 0; i < checkedElements.length; i++) {
-			selection.getClasspathElements().add(checkedElements[i]);
-		}
-		return selection;
-	}
-
-	protected ClassPathSelection getUnSelectedClassPathSelection() {
-		ClassPathSelection selection = new ClassPathSelection();
-		Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
-		List modelElements = model.getClassPathSelection().getClasspathElements();
-		for (int i = 0; i < modelElements.size(); i++) {
-			List checkedElementsList = Arrays.asList(checkedElements);
-			if (!checkedElementsList.contains(modelElements.get(i))) {
-				selection.getClasspathElements().add(modelElements.get(i));
-			}
-		}
-		return selection;
-	}
-
-
-	private ClassPathSelection getSelectedClassPathSelectionForWLPs() {
-		ClassPathSelection selection = new ClassPathSelection();
-		Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
-		for (int i = 0; i < checkedElements.length; i++) {
-			selection.getClasspathElements().add(checkedElements[i]);
-		}
-		return selection;
-	}
-
-	protected UpdateManifestOperation createManifestOperation() {
-		return new UpdateManifestOperation(project.getName(), model.getClassPathSelection().toString(), true);
-	}
-	
-	protected void createClasspathAttributeUpdateOperation(final WorkspaceModifyComposedOperation composedOp, final ClassPathSelection selection, final boolean isWebApp) {
-		final Map selectedEntriesToRuntimePath = new HashMap();
-		final Map unselectedEntriesToRuntimePath = new HashMap();
-		final List elements = selection.getClasspathElements();
-		for (int i = 0; i < elements.size(); i++) {
-			final ClasspathElement element = (ClasspathElement) elements.get(i);
-			if (element.isClasspathEntry()) {
-				final IClasspathEntry entry = element.getClasspathEntry();
-				final IClasspathAttribute attrib = ClasspathDependencyUtil.checkForComponentDependencyAttribute(entry);
-				boolean hasDepAttrib = false;
-				if (attrib != null && attrib.getName().equals(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY)) {
-					hasDepAttrib = true;
-				}
-				final IPath runtimePath = ClasspathDependencyUtil.getRuntimePath(attrib, isWebApp, ClasspathDependencyUtil.isClassFolderEntry(entry));
-				if (element.isSelected()) {
-					// only add if we don't already have the attribute
-					if (!hasDepAttrib) {
-						selectedEntriesToRuntimePath.put(entry, runtimePath);
-					}
-				} else {
-					// only add if we already have the attribute
-					if (hasDepAttrib) {
-						unselectedEntriesToRuntimePath.put(entry, runtimePath);
-					}
-				}
-			}
-		}
-		
-		// if there are any attributes to add, create an operation to add all necessary attributes 
-		if (!selectedEntriesToRuntimePath.isEmpty()) {
-			IDataModelOperation op = UpdateClasspathAttributeUtil.createAddDependencyAttributesOperation(project.getName(), selectedEntriesToRuntimePath); 
-			composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(op));
-		}
-		// if there are any attributes to remove, create an operation to remove all necessary attributes
-		if (!unselectedEntriesToRuntimePath.isEmpty()) {
-			IDataModelOperation op = UpdateClasspathAttributeUtil.createRemoveDependencyAttributesOperation(project.getName(), unselectedEntriesToRuntimePath); 
-			composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(op));
-		}
-	}
-
-	protected boolean isReadOnly() {
-		return JemProjectUtilities.isBinaryProject(project) && (project.findMember(IModuleConstants.COMPONENT_FILE_PATH) == null) ;
-	}
-	
-	protected void modifyEARBundledLibs() {
-		List compsToUncheckList = tableManager.getCheckedLibsAsList();
-		if (compsToUncheckList.size() == 0) return;
-		Set allCompsToUncheck = new HashSet();
-		Set allCompNamesToUncheck = new HashSet();		
-		for (int i = 0; i < compsToUncheckList.size(); i++) {
-			IVirtualComponent comp = (IVirtualComponent)compsToUncheckList.get(i);
-			allCompsToUncheck.add(comp);
-			if (comp instanceof J2EEModuleVirtualArchiveComponent) allCompNamesToUncheck.add(comp.getName());
-		}
- 		IProject[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
-		for (int i = 0; i < ears.length; i++) {
-			IEARModelProvider earModel = (IEARModelProvider)ModelProviderManager.getModelProvider(ears[i]);
-			if (J2EEProjectUtilities.isJEEProject(ears[i])) {	
-				IVirtualComponent earComponent = ComponentCore.createComponent(ears[i]);
-				List listToUncheck = createListToUncheck(earComponent, allCompsToUncheck, allCompNamesToUncheck);
-				if (listToUncheck.size() == 0) continue;
-				removeModulesFromEAR(new NullProgressMonitor(), earComponent, listToUncheck);
-				addModulesToEAR(new NullProgressMonitor(), earComponent, listToUncheck);
-			}
-		}			
-	}
-	//---------------------------------
-	private IStatus removeModulesFromEAR(IProgressMonitor monitor, final IVirtualComponent earComponent, final List compsToUncheckList) {
-		IStatus stat = IDataModelProvider.OK_STATUS;
-		String libDir = ((Application)ModelProviderManager.getModelProvider(earComponent.getProject()).getModelObject()).getLibraryDirectory();
-		libDir = (libDir == null) ? J2EEConstants.EAR_DEFAULT_LIB_DIR : libDir;
-		Map dependentComps = getEARModuleDependencies(earComponent, compsToUncheckList);
-		try {
-			IDataModelOperation op = removeComponentFromEAROperation(earComponent, compsToUncheckList, libDir);
-			op.execute(null, null);
-			J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(earComponent.getProject());
-			removeEARComponentDependencies(dependentComps);
-		} catch (ExecutionException e) {
-			Logger.getLogger().log(e);
-		}
-		return stat;
-	}		
-	
-	
-	private IStatus addModulesToEAR(IProgressMonitor monitor, final IVirtualComponent earComponent, final List compsToUncheckList) {
-		IStatus stat = IDataModelProvider.OK_STATUS;
-		try {
-			IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
-				public void run(IProgressMonitor monitor) throws CoreException{
-					execAddOp(monitor, compsToUncheckList, J2EEConstants.EAR_ROOT_DIR, earComponent);
-				}
-			};
-			J2EEUIPlugin.getWorkspace().run(runnable, monitor);
-		} catch (Exception e) {
-			Logger.getLogger().log(e);
-		}
-		return IDataModelProvider.OK_STATUS;
-	}
-
-	private List createListToUncheck(IVirtualComponent earComponent, Set compsToUncheckList, Set compNamesToUncheck) {	
-		LinkedList res = new LinkedList();
-		IVirtualReference[] refs = earComponent.getReferences();
-		for (int j = 0; j < refs.length; j++) {
-			if (!refs[j].getRuntimePath().isRoot() &&
-					(compsToUncheckList.contains(refs[j].getReferencedComponent()) ||
-					compNamesToUncheck.contains(refs[j].getReferencedComponent().getName()))) {
-				res.add(refs[j].getReferencedComponent());
-			}		
-		}
-		return res;
-	}	
-		
-	private void execAddOp(IProgressMonitor monitor, List list, String path, IVirtualComponent earComponent) throws CoreException {
-		IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-		
-		dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);					
-		dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, list);
-		dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-
-		IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-		if (stat != IDataModelProvider.OK_STATUS)
-			throw new CoreException(stat);
-		try {
-			dm.getDefaultOperation().execute(monitor, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().log(e);
-		}		
-	}
-		
-	
-	protected IDataModelOperation removeComponentFromEAROperation(IVirtualComponent sourceComponent, List targetComponentsHandles, String dir) {
-		IDataModel model = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
-		model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
-		List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-		modHandlesList.addAll(targetComponentsHandles);
-		model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
-        model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, dir);		
-		return model.getDefaultOperation();
-	}
-	
-	private Map getEARModuleDependencies(final IVirtualComponent earComponent, final List components) {
-		final Map dependentComps = new HashMap();
-		// get all current references to project within the scope of this EAR
-		for (int i = 0; i < components.size(); i++) {
-			
-			final List compsForProject = new ArrayList();
-			final IVirtualComponent comp = (IVirtualComponent) components.get(i);
-			final IProject[] dependentProjects = DependencyGraphManager.getInstance().getDependencyGraph().getReferencingComponents(comp.getProject());
-			for (int j = 0; j < dependentProjects.length; j++) {
-				final IProject project = dependentProjects[j];
-				// if this is an EAR, can skip
-				if (J2EEProjectUtilities.isEARProject(project)) {
-					continue;
-				}
-				final IVirtualComponent dependentComp = ComponentCore.createComponent(project);
-				// ensure that the project's share an EAR
-				final IProject[] refEARs = J2EEProjectUtilities.getReferencingEARProjects(project);
-				boolean sameEAR = false;
-				for (int k = 0; k < refEARs.length; k++) {
-					if (refEARs[k].equals(earComponent.getProject())) {
-						sameEAR = true;
-						break;
-					}
-				}
-				if (!sameEAR) {
-					continue;
-				}
-				// if the dependency is a web lib dependency, can skip
-				if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-					IVirtualReference ref = dependentComp.getReference(comp.getName());
-					if (ref != null && ref.getRuntimePath().equals(new Path("/WEB-INF/lib"))) { //$NON-NLS-1$
-						continue;
-					}
-				}
-				compsForProject.add(dependentComp);
-			}
-			dependentComps.put(comp, compsForProject);
-		}
-		return dependentComps;
-	}
-	
-	private void removeEARComponentDependencies(final Map dependentComps) throws ExecutionException {
-		final Iterator targets = dependentComps.keySet().iterator();
-		while (targets.hasNext()) {
-			final IVirtualComponent target = (IVirtualComponent) targets.next();
-			final List sources = (List) dependentComps.get(target);
-			for (int i = 0; i < sources.size(); i++) {
-				final IVirtualComponent source = (IVirtualComponent) sources.get(i);
-				final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
-				model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, source);
-				final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-				modHandlesList.add(target);
-				model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
-				model.getDefaultOperation().execute(null, null);
-				// update the manifest
-				removeManifestDependency(source, target);
-			}
-		}
-	}
-
-	private void removeManifestDependency(final IVirtualComponent source, final IVirtualComponent target) 
-		throws ExecutionException {
-		final String sourceProjName = source.getProject().getName();
-		final String targetProjName = target.getProject().getName();
-		final IProgressMonitor monitor = new NullProgressMonitor();
-		final IFile manifestmf = J2EEProjectUtilities.getManifestFile(source.getProject());
-		final ArchiveManifest mf = J2EEProjectUtilities.readManifest(source.getProject());
-		if (mf == null)
-			return;
-		final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, sourceProjName);
-		updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
-		String[] cp = mf.getClassPathTokenized();
-		List cpList = new ArrayList();
-		String cpToRemove = targetProjName + ".jar";//$NON-NLS-1$
-		for (int i = 0; i < cp.length; i++) {
-			if (!cp[i].equals(cpToRemove)) {
-				cpList.add(cp[i]);
-			}
-		}
-		updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
-		updateManifestDataModel.getDefaultOperation().execute(monitor, null );
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java
deleted file mode 100644
index e70c7e7b1..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ManifestErrorPrompter implements ICommonManifestUIConstants {
-
-	/**
-	 * Constructor for ManifestErrorPrompter.
-	 */
-	private ManifestErrorPrompter() {
-		super();
-	}
-	
-	public static boolean showManifestException(Shell shell, String baseMessage, boolean includeCancel, Throwable caught) {
-		StringBuffer msg = new StringBuffer(baseMessage);
-		msg.append("\n"); //$NON-NLS-1$
-		msg.append(MANIFEST_PROBLEM_1);
-		msg.append("\n"); //$NON-NLS-1$
-		msg.append(MANIFEST_PROBLEM_2);
-		msg.append("\n"); //$NON-NLS-1$
-		msg.append(MANIFEST_PROBLEM_3);
-		msg.append("\n"); //$NON-NLS-1$
-		msg.append(MANIFEST_PROBLEM_4);
-		return ErrorDialog.openError(shell,
-		   ERROR_READING_MANIFEST_DIALOG_TITLE,
-		   msg.toString(),
-		   caught,
-		   0, includeCancel);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
deleted file mode 100644
index 50c1f238b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ManifestUIResourceHandler extends NLS {
-
-	private static final String BUNDLE_NAME = "manifest_ui";//$NON-NLS-1$
-
-	private ManifestUIResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String Up_1;
-	public static String Down_2;
-	public static String Select_All_3;
-	public static String Deselect_All_4;
-	public static String ERROR_READING_MANIFEST_DIALOG_TITLE;
-	public static String SAVE_MANIFEST_WITH_ERROR;
-	public static String ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR;
-	public static String ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE;
-	public static String MANIFEST_PROBLEM_1;
-	public static String MANIFEST_PROBLEM_2;
-	public static String MANIFEST_PROBLEM_3;
-	public static String MANIFEST_PROBLEM_4;
-	public static String An_internal_error_occurred_ERROR_;
-	public static String Project_name__UI_;
-	public static String EAR_Project_Name__UI__UI_;
-	public static String Available_dependent_JARs__UI_;
-	public static String Manifest_Class_Path__UI_;
-	public static String JAR_Module_UI_;
-	public static String Packed_In_Lib_UI_;
-	public static String Project_UI_;
-	public static String EAR_Modules;
-	public static String EAR_Modules_Desc;
-	public static String J2EE_Modules;
-	public static String J2EE_Modules_Desc;
-	public static String Web_Libraries;
-	public static String Web_Libraries_Desc;
-	public static String Web_Ref_Desc;
-	public static String EAR_Module_Dep_Error;
-	public static String Unreferenced_Module_Error;
-	public static String Jar_Dep_One_Module_Error;
-	public static String Web_Lib_Error;
-	public static String REDIRECT_TEXT_EDITOR_UI_;
-	public static String Error_Checking_Project_Facets;
-	public static String WEB_LIB_LIST_DESCRIPTION;
-	public static String Dynamic_Web_Error;
-	public static String No_Web_Reference_Error;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ManifestUIResourceHandler.class);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/SecondCheckBoxStateChangedEvent.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/SecondCheckBoxStateChangedEvent.java
deleted file mode 100644
index df0df7ec2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/SecondCheckBoxStateChangedEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckable;
-import org.eclipse.jst.j2ee.internal.ui.DoubleCheckboxTableItem;
-
-public class SecondCheckBoxStateChangedEvent extends CheckStateChangedEvent {
-	
-	private DoubleCheckboxTableItem item = null;
-	
-	public SecondCheckBoxStateChangedEvent(ICheckable source, 
-											Object element, 
-											boolean state) {
-		super(source, element, state);
-	}	
-	
-	public void setTableItem(DoubleCheckboxTableItem itm) { 
-		item = itm;
-	}
-	
-	public DoubleCheckboxTableItem getTableItem() {
-		return item;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java
deleted file mode 100644
index cdf1c19ae..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-/**
- * @author jialin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class UpdateManifestOperation implements org.eclipse.jface.operation.IRunnableWithProgress {
-	protected String projectName;
-	protected String classPathValue;
-	protected boolean replace;
-/**
- * UpdateManifestOperation constructor comment.
- */
-public UpdateManifestOperation(String aProjectName, String aSpaceDelimitedPath, boolean replaceInsteadOfMerge) {
-	super();
-	projectName = aProjectName;
-	classPathValue = aSpaceDelimitedPath;
-	replace = replaceInsteadOfMerge;
-}
-protected IProject getProject() {
-	return J2EEPlugin.getWorkspace().getRoot().getProject(projectName);
-}
-/**
- * Runs this operation.  Progress should be reported to the given progress monitor.
- * This method is usually invoked by an <code>IRunnableContext</code>'s <code>run</code> method,
- * which supplies the progress monitor.
- * A request to cancel the operation should be honored and acknowledged 
- * by throwing <code>InterruptedException</code>.
- *
- * @param monitor the progress monitor to use to display progress and receive
- *   requests for cancelation
- * @exception InvocationTargetException if the run method must propagate a checked exception,
- * 	it should wrap it inside an <code>InvocationTargetException</code>; runtime exceptions are automatically
- *  wrapped in an <code>InvocationTargetException</code> by the calling context
- * @exception InterruptedException if the operation detects a request to cancel, 
- *  using <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing 
- *  <code>InterruptedException</code>
- *
- * @see IRunnableContext#run
- */
-public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, InterruptedException {
-	IProject p = getProject();
-	try {
-		ArchiveManifest mf = J2EEProjectUtilities.readManifest(p);
-		if (mf == null)
-			mf = new ArchiveManifestImpl();
-		mf.addVersionIfNecessary();
-		if (replace)
-			mf.setClassPath(classPathValue);
-		else
-			mf.mergeClassPath(ArchiveUtil.getTokens(classPathValue));
-		J2EEProjectUtilities.writeManifest(p, mf);
-	} catch (java.io.IOException ex) {
-		throw new WFTWrappedException(ex);
-	}
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java
deleted file mode 100644
index d5045bc02..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelListener;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation;
-
-public class WebLibDependencyPropertiesPage extends JARDependencyPropertiesPage implements IClasspathTableOwner, Listener, ClasspathModelListener {
-
-	public WebLibDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
-		super(project, page);
-	}
-
-	protected ClasspathModel createClasspathModel() {
-		return new ClasspathModel(null, true);
-	}
-	
-	public Composite createContents(Composite parent) {
-		initialize();
-		Composite composite = createBasicComposite(parent);
-		if (model.getComponent() != null) {
-			if (!isValidWebModule())
-				return composite;
-			J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.Web_Libraries_Desc);
-			// createProjectLabelsGroup(composite);
-			createListGroup(composite);
-			handleWLPSupport();
-			setEnablement();
-		}
-	    Dialog.applyDialogFont(parent);
-	    postCreateContents();
-		return composite;
-	}
-
-	protected void createProjectLabelsGroup(Composite parent) {
-
-		Composite labelsGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		labelsGroup.setLayout(layout);
-		labelsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label label = new Label(labelsGroup, SWT.NONE);
-		label.setText(ManifestUIResourceHandler.Project_name__UI_);
-
-		componentNameText = new Text(labelsGroup, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		componentNameText.setEditable(false);
-		componentNameText.setLayoutData(data);
-		componentNameText.setText(project.getName());
-	}
-
-	protected void createListGroup(Composite parent) {
-		Composite listGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		listGroup.setLayout(layout);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		gData.horizontalIndent = 5;
-		listGroup.setLayoutData(gData);
-
-		availableDependentJars = new Label(listGroup, SWT.NONE);
-		gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		availableDependentJars.setText(ManifestUIResourceHandler.Available_dependent_JARs__UI_);
-		availableDependentJars.setLayoutData(gData);
-		createTableComposite(listGroup);
-	}
-
-	protected void createTableComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(gData);
-		tableManager = new ClasspathTableManager(this, model, validateEditListener);
-		tableManager.fillWLPComposite(composite);
-	}
-
-	protected boolean isValidWebModule() {
-		if (!J2EEProjectUtilities.isDynamicWebProject(project)) {
-			propPage.setErrorMessage(ManifestUIResourceHandler.Web_Lib_Error);
-			return false;
-		}
-		return true;
-	}
-
-	protected void setEnablement() {
-		if (tableManager.availableJARsViewer.getTable().getItems().length == 0) {
-			tableManager.selectAllButton.setEnabled(false);
-			tableManager.deselectAllButton.setEnabled(false);
-		} else {
-			tableManager.selectAllButton.setEnabled(true);
-			tableManager.deselectAllButton.setEnabled(true);
-		}
-	}
-
-	private void handleWLPSupport() {
-		availableDependentJars.setText(ManifestUIResourceHandler.WEB_LIB_LIST_DESCRIPTION);
-		tableManager.refresh();
-	}
-	
-	@Override
-	protected void handleClasspathChange() {
-		model.resetClassPathSelectionForWLPs();
-		super.handleClasspathChange();
-		setEnablement();
-	}
-
-	public boolean performOk() {
-		if (model.getComponent() == null || !isValidWebModule()) {
-			return true;
-		}
-		if (!isDirty) {
-			return true;
-		}
-		try {
-			boolean createdFlexProjects = runWLPOp(createFlexProjectOperations());
-			boolean createdComponentDependency = false;
-			if (createdFlexProjects) {
-				createdComponentDependency = runWLPOp(createComponentDependencyOperations());
-				isDirty = false;
-			}
-			// treat as a classpath change for refresh purposes
-			// XXX this refresh is not working - suspect it is because the virtual component dependencies are
-			// not consistently being recomputed
-			//handleClasspathChange();
-			return createdComponentDependency;
-		} finally {
-			model.dispose();
-		}
-	}
-
-	private boolean runWLPOp(WorkspaceModifyComposedOperation composed) {
-		try {
-			if (composed != null)
-				new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
-		} catch (InvocationTargetException ex) {
-			ex.printStackTrace();
-			if (ex.getCause() != null) {
-				ex.getCause().printStackTrace();
-			}
-			String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
-			String msg = title;
-			if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
-				msg = ex.getTargetException().getMessage();
-			MessageDialog.openError(propPage.getShell(), title, msg);
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
-			return false;
-		} catch (InterruptedException e) {
-			// cancelled
-			return false;
-		}
-		return true;
-	}
-
-	private void createRef(String aComponentName){
-		IVirtualComponent archive = ComponentCore.createArchiveComponent(model.getComponent().getProject(), aComponentName);
-
-		// To do: check if archive component already exists
-		IVirtualReference ref = ComponentCore.createReference(model.getComponent(), archive, new Path("/WEB-INF/lib")); //$NON-NLS-1$
-		model.getComponent().addReferences(new IVirtualReference [] { ref });
-
-		ClasspathElement element = createClassPathElement(archive, archive.getName());
-//		ClassPathSelection selection = createClassPathSelectionForExternalJar(element);
-		model.getClassPathSelectionForWLPs().getClasspathElements().add(element);
-	}
-	
-	public void handleSelectExternalJarButton() {
-		if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-			IPath[] selected = BuildPathDialogAccess.chooseExternalJAREntries(propPage.getShell());
-			if (selected != null) {
-				String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
-				for (int i = 0; i < selected.length; i++) {
-					createRef(type + selected[i].toString());
-				}
-				refresh();
-			}
-		}
-	}
-
-	public void handleSelectVariableButton() {
-		if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-			IPath existingPath[] = new Path[0];
-			IPath[] selected = BuildPathDialogAccess.chooseVariableEntries(propPage.getShell(), existingPath);
-
-			if (selected != null) {
-				String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
-				for (int i = 0; i < selected.length; i++) {
-					IPath resolvedPath = JavaCore.getResolvedVariablePath(selected[i]);
-					java.io.File file = new java.io.File(resolvedPath.toOSString());
-					if (file.isFile() && file.exists()) {
-						createRef(type + selected[i].toString());
-					} else {
-						// display error
-					}
-				}
-				refresh();
-			}
-		}
-	}
-
-	private ClasspathElement createClassPathElement(IVirtualComponent archiveComp, String unresolvedName) {
-
-		URI uri = URI.createURI(ModuleURIUtil.getHandleString(archiveComp));
-		ClasspathElement element = new ClasspathElement(uri);
-		element.setValid(false);
-		element.setSelected(true);
-		element.setRelativeText(unresolvedName);
-		element.setText(unresolvedName);
-		element.setEarProject(null);
-		return element;
-	}
-
-//	private ClassPathSelection createClassPathSelectionForExternalJar(ClasspathElement element) {
-//		ClassPathSelection selection = new ClassPathSelection();
-//		selection.getClasspathElements().add(element);
-//		return selection;
-//	}
-
-//	private ClassPathSelection createClassPathSelectionForProjectJar(ClasspathElement element) {
-//		ClassPathSelection selection = new ClassPathSelection();
-//		selection.getClasspathElements().add(element);
-//		return selection;
-//	}
-
-	public void handleSelectProjectJarButton() {
-		if (J2EEProjectUtilities.isDynamicWebProject(project)) {
-			IPath[] selected = BuildPathDialogAccess.chooseJAREntries(propPage.getShell(), project.getLocation(), new IPath[0]);
-			if (selected != null) {
-				String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
-				for (int i = 0; i < selected.length; i++) {
-					createRef(type + selected[i].makeRelative().toString());
-				}
-				refresh();
-			}
-		}
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebRefDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebRefDependencyPropertiesPage.java
deleted file mode 100644
index 3827e1abb..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebRefDependencyPropertiesPage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     rfrost@bea.com - derived from WebLibDependencyPropertiesPage for projects referenced just from a dynamic web project.
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Supports UI manipulation of the published/exported classpath entries for projects referenced by dynamic web projects.
- */
-public class WebRefDependencyPropertiesPage extends JARDependencyPropertiesPage {
-
-	public WebRefDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
-		super(project, page);
-	}
-
-	@Override
-	public Composite createContents(Composite parent) {
-		initialize();
-		Composite composite = createBasicComposite(parent);
-		if (model.getComponent() != null) {
-			if (!isValidComponent()) {
-				return composite;
-			}
-			J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.Web_Ref_Desc);
-			createListGroup(composite);
-			tableManager.refresh();
-			setEnablement();
-		}
-	    Dialog.applyDialogFont(parent);
-	    postCreateContents();
-		return composite;
-	}
-
-	@Override
-	protected void createTableComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridData gData = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(gData);
-		tableManager = new ClasspathTableManager(this, model, validateEditListener);
-		tableManager.setReadOnly(isReadOnly());
-		tableManager.fillWebRefComposite(composite);
-	}
-
-	@Override
-	protected boolean isValidComponent() {
-		// must have the Java nature and cannot be a dynamic web project
-		boolean isJavaProject = false;
-		try {
-			isJavaProject = project.hasNature(JavaCore.NATURE_ID);
-		} catch (CoreException ce) {}
-		if (J2EEProjectUtilities.isDynamicWebProject(project) || !isJavaProject) {
-			propPage.setErrorMessage(ManifestUIResourceHandler.Dynamic_Web_Error); 
-			return false;
-		} else if (J2EEProjectUtilities.getReferencingWebProjects(project).length == 0) {
-			propPage.setErrorMessage(ManifestUIResourceHandler.No_Web_Reference_Error);
-			return false;
-		}
-		return true;
-	}
-	
-	protected void setEnablement() {
-		if (tableManager.availableJARsViewer.getTable().getItems().length == 0) {
-			tableManager.selectAllButton.setEnabled(false);
-			tableManager.deselectAllButton.setEnabled(false);
-		} else {
-			tableManager.selectAllButton.setEnabled(true);
-			tableManager.deselectAllButton.setEnabled(true);
-		}
-	}
-	
-	@Override
-	protected void handleClasspathChange() {
-		super.handleClasspathChange();
-		setEnablement();
-	}
-
-	@Override
-	public boolean performOk() {
-		if (model.getComponent() == null || !isValidComponent()) {
-			return true;
-		}
-		if (!isDirty) {
-			return true;
-		}
-		return super.performOk();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index 0b51edca2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * WARNING: This class will be deleted
- * 
- * @deprecated use {@link org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation}
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation {
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	public WorkspaceModifyComposedOperation() {
-		super();
-	}
-
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
-		super(rule, nestedRunnablesWithProgress);
-	}
-
-	public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
-		super(nestedRunnablesWithProgress);
-	}
-
-	public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
-		super(nestedOp);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java
deleted file mode 100644
index 9d9a71ef2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public abstract class AbstractActionDelegate implements org.eclipse.ui.IActionDelegate {
-	protected ISelection selection;
-	protected boolean allowsMultiSelect = false;
-	public static final Class IPROJECT_CLASS = IProject.class;
-	private final static String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
-	private final static String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
-
-	/**
-	 * EditModuleDependencyAction constructor comment.
-	 */
-	public AbstractActionDelegate() {
-		super();
-	}
-
-	/**
-	 * Applicable only when this action does not allow multi select
-	 */
-	protected IProject getProject() {
-		return getProject(getSelectedElement());
-	}
-
-	protected List getProjects() {
-		if ((selection == null) || !(selection instanceof IStructuredSelection))
-			return Collections.EMPTY_LIST;
-
-		List result = new ArrayList();
-		IStructuredSelection struct = (IStructuredSelection) selection;
-		Iterator it = struct.iterator();
-		while (it.hasNext()) {
-			IProject p = getProject(it.next());
-			if (p != null)
-				result.add(p);
-		}
-		return result;
-	}
-
-	protected IProject getProject(Object element) {
-
-		if (isSupportedAction(element))
-			return ProjectUtilities.getProject((EObject) element);
-		else if (element instanceof IAdaptable)
-			return (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
-		else
-			return null;
-	}
-
-	protected IStructuredSelection getStructuredSelection() {
-		if ((selection == null) || !(selection instanceof IStructuredSelection))
-			return null;
-		else if (selection.isEmpty()) {
-			selection = J2EEUIPlugin.getCurrentSelection();
-		}
-		return (IStructuredSelection) selection;
-	}
-
-	/*
-	 * Only return if there is exactly one item selected
-	 */
-	protected Object getSelectedElement() {
-		IStructuredSelection sel = getStructuredSelection();
-		return sel == null ? null : sel.getFirstElement();
-	}
-
-	protected IWorkbenchWindow getWorkbenchWindow() {
-		return J2EEUIPlugin.getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Can the receiver be executed for
-	 * 
-	 * @element
-	 */
-	protected abstract boolean isSupportedAction(Object element);
-
-	/**
-	 * @deprecated use {@link #primRun(Shell)}
-	 */
-	protected void primRun(IProject project, Shell shell) {
-		//Deprecated
-	}
-
-	/**
-	 * Subclasses should override this instead of {@link #run(org.eclipse.jface.action.IAction)}
-	 */
-	protected void primRun(Shell shell) {
-		primRun(getProject(), shell);
-	}
-
-	/**
-	 * Performs this action.
-	 * <p>
-	 * This method is called when the delegating action has been triggered. Implement this method to
-	 * do the actual work.
-	 * </p>
-	 * 
-	 * @param action
-	 *            the action proxy that handles the presentation portion of the action
-	 */
-	public void run(org.eclipse.jface.action.IAction action) {
-
-		Shell shell = getWorkbenchWindow().getShell();
-		setActionStateFromProjects(action);
-		if (!action.isEnabled())
-			MessageDialog.openInformation(shell, J2EEUIMessages.getResourceString("INFORMATION_UI_"), J2EEUIMessages.getResourceString("CHOSEN_OP_NOT_AVAILABLE")); //$NON-NLS-2$ = "The chosen operation is not currently available." //$NON-NLS-1$ = "Information"
-		else {
-			try {
-				primRun(shell);
-			} catch (Throwable t) {
-				org.eclipse.jst.j2ee.internal.plugin.ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
-			}
-		}
-
-
-	}
-
-	/**
-	 * Notifies this action delegate that the selection in the workbench has changed.
-	 * <p>
-	 * Implementers can use this opportunity to change the availability of the action or to modify
-	 * other presentation properties.
-	 * </p>
-	 * 
-	 * @param action
-	 *            the action proxy that handles presentation portion of the action
-	 * @param aSelection
-	 *            the current selection in the workbench
-	 */
-	public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection aSelection) {
-		this.selection = aSelection;
-		setActionState(action);
-	}
-
-	protected void setActionState(IAction action) {
-		if (allowsMultiSelect)
-			setActionStateForMultiSelect(action);
-		else
-			setActionStateForSingleSelect(action);
-	}
-
-	protected void setActionStateForSingleSelect(IAction action) {
-		IStructuredSelection sel = getStructuredSelection();
-		if (sel == null || sel.size() != 1) {
-			action.setEnabled(false);
-			return;
-		}
-		setActionStateFromProjects(action);
-	}
-
-	protected void setActionStateForMultiSelect(IAction action) {
-		setActionStateFromProjects(action);
-	}
-
-	protected void setActionStateFromProjects(IAction action) {
-		IStructuredSelection sel = getStructuredSelection();
-		boolean allOk = false;
-		if (sel != null && !sel.isEmpty()) {
-			allOk = true;
-			Iterator it = sel.iterator();
-			while (it.hasNext()) {
-				Object o = it.next();
-				IProject project = getProject(o);
-				if (project == null || !project.isOpen()) {
-					allOk = false;
-					break;
-				}
-			}
-		}
-		action.setEnabled(allOk);
-	}
-
-	/**
-	 * Returns the allowsMultiSelect.
-	 * 
-	 * @return boolean
-	 */
-	public boolean allowsMultiSelect() {
-		return allowsMultiSelect;
-	}
-
-
-	/**
-	 * Sets the allowsMultiSelect.
-	 * 
-	 * @param allowsMultiSelect
-	 *            The allowsMultiSelect to set
-	 */
-	public void setAllowsMultiSelect(boolean allowsMultiSelect) {
-		this.allowsMultiSelect = allowsMultiSelect;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java
deleted file mode 100644
index 1dbce3ddc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.actions;
-
-
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-
-
-public abstract class AbstractActionWithDelegate extends org.eclipse.ui.actions.SelectionListenerAction {
-	protected IActionDelegate delegate;
-
-	/**
-	 * EditModuleDependencyAction constructor comment.
-	 * 
-	 * @param text
-	 *            java.lang.String
-	 */
-	public AbstractActionWithDelegate() {
-		super("");//$NON-NLS-1$
-		initLabel();
-		initDelegate();
-	}
-
-	protected abstract IActionDelegate createDelegate();
-
-	protected abstract String getLabel();
-
-	protected void initDelegate() {
-		delegate = createDelegate();
-	}
-
-	protected void initLabel() {
-		setText(getLabel());
-	}
-
-	/**
-	 * Implementation of method defined on <code>IAction</code>.
-	 */
-	public void run() {
-		delegate.run(this);
-	}
-
-	/**
-	 * Updates this action in response to the given selection.
-	 * <p>
-	 * The <code>SelectionListenerAction</code> implementation of this method returns
-	 * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
-	 * super method returns <code>false</code>, the overriding method must also return
-	 * <code>false</code>.
-	 * </p>
-	 * 
-	 * @param selection
-	 *            the new selection
-	 * @return <code>true</code> if the action should be enabled for this selection, and
-	 *         <code>false</code> otherwise
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		delegate.selectionChanged(this, selection);
-		return this.isEnabled();
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
deleted file mode 100644
index fbd602ea1..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.actions;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-/**
- * Action for opening a J2EE resource from the J2EE navigator.
- */
-public abstract class AbstractOpenAction extends SelectionListenerAction implements IActionDelegate2 {
-	// //$NON-NLS-1$
-	protected IEditorDescriptor currentDescriptor;
-	protected Object srcObject;
-
-	protected AbstractOpenAction(String text) {
-		super(text);
-	}
-
-	protected static IEditorDescriptor findEditorDescriptor(String id) {
-		IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-		return registry.findEditor(id);
-	}
-
-	protected void setAttributesFromDescriptor() {
-		if (currentDescriptor == null)
-			return;
-		//setText(currentDescriptor.getLabel());
-		setToolTipText(currentDescriptor.getLabel());
-		//setImageDescriptor(currentDescriptor.getImageDescriptor());
-	}
-
-	/**
-	 * The structured selection has changed in the workbench. Subclasses should override this method
-	 * to react to the change. Returns true if the action should be enabled for this selection, and
-	 * false otherwise.
-	 * 
-	 * When this method is overridden, the super method must always be invoked. If the super method
-	 * returns false, this method must also return false.
-	 * 
-	 * @param sel
-	 *            the new structured selection
-	 */
-	public boolean updateSelection(IStructuredSelection s) {
-		srcObject = null;
-		if (!super.updateSelection(s))
-			return false;
-
-		if (s.size() != 1)
-			return false;
-
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-		//Dispose
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-		//init
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		runWithEvent(event);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		// TODO Auto-generated method stub
-		run();
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		// TODO HACK!
-		updateSelection((IStructuredSelection) selection);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java
deleted file mode 100644
index d652982bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-
-
-public abstract class AbstractOpenWizardAction extends org.eclipse.jface.action.Action {
-	// //$NON-NLS-1$
-
-	private IWorkbench fWorkbench;
-
-	private Class[] fActivatedOnTypes;
-
-	private boolean fAcceptEmptySelection;
-
-	protected AbstractOpenWizardAction() {
-		//Default constructor
-	}
-
-	public AbstractOpenWizardAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
-		super(label);
-		fWorkbench = workbench;
-		fActivatedOnTypes = activatedOnTypes;
-		fAcceptEmptySelection = acceptEmptySelection;
-	}
-
-	public AbstractOpenWizardAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
-		this(workbench, label, null, acceptEmptySelection);
-	}
-
-	public boolean canActionBeAdded() {
-		ISelection selection = getCurrentSelection();
-		if (selection == null || selection.isEmpty()) {
-			return fAcceptEmptySelection;
-		}
-		if (fActivatedOnTypes != null) {
-			if (selection instanceof IStructuredSelection) {
-				return isEnabled(((IStructuredSelection) selection).iterator());
-			}
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Create the specific Wizard (to be implemented by a subclass)
-	 */
-	abstract protected Wizard createWizard();
-
-	protected IStructuredSelection getCurrentSelection() {
-		IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			ISelection selection = window.getSelectionService().getSelection();
-			if (selection instanceof IStructuredSelection) {
-				return (IStructuredSelection) selection;
-			}
-
-		}
-		return null;
-	}
-
-	protected IWorkbench getWorkbench() {
-		return fWorkbench;
-	}
-
-	private boolean isEnabled(Iterator iter) {
-		while (iter.hasNext()) {
-			Object obj = iter.next();
-			if (!isOfAcceptedType(obj) || !shouldAcceptElement(obj)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private boolean isOfAcceptedType(Object obj) {
-		for (int i = 0; i < fActivatedOnTypes.length; i++) {
-			if (fActivatedOnTypes[i].isInstance(obj)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected String getDialogText() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_LBL);
-	}
-
-	/**
-	 * The user has invoked this action.
-	 */
-	public void run() {
-		Wizard wizard = createWizard();
-		if (wizard instanceof IWorkbenchWizard) {
-			IStructuredSelection sel = null;
-			if (null != getCurrentSelection())
-				sel = getCurrentSelection();
-			else
-				sel = new StructuredSelection();
-			((IWorkbenchWizard) wizard).init(J2EEUIPlugin.getDefault().getWorkbench(), sel);
-		}
-		if (WorkbenchActivityHelper.allowUseOf(null,wizard)) {
-			IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-			WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
-			dialog.create();
-			String text = getDialogText();
-			if (null != text) {
-				dialog.getShell().setText(text);
-			}
-			dialog.open();
-		}
-	}
-
-	protected void setWorkbench(IWorkbench workbench) {
-		fWorkbench = workbench;
-	}
-
-	/**
-	 * can be overridden to add more checks obj is guaranteed to be instance of one of the accepted
-	 * types
-	 */
-	protected boolean shouldAcceptElement(Object obj) {
-		return true;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java
deleted file mode 100644
index 5c7093697..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public abstract class AbstractOpenWizardWorkbenchAction extends AbstractOpenWizardAction implements org.eclipse.ui.IWorkbenchWindowActionDelegate {
-	protected AbstractOpenWizardWorkbenchAction() {
-		//Default
-	}
-
-	public AbstractOpenWizardWorkbenchAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
-		super(workbench, label, null, acceptEmptySelection);
-	}
-
-	public AbstractOpenWizardWorkbenchAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
-		super(workbench, label, null, acceptEmptySelection);
-	}
-
-	/**
-	 * @see AbstractOpenWizardAction#dispose
-	 */
-	public void dispose() {
-		// do nothing.
-		setWorkbench(null);
-	}
-
-	/**
-	 * @see AbstractOpenWizardAction#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		setWorkbench(window.getWorkbench());
-	}
-
-	/**
-	 * @see IActionDelegate#run
-	 */
-	public void run(IAction action) {
-		run();
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		// do nothing. Action doesn't depend on selection.
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
deleted file mode 100644
index 7cc713191..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-/**
- * @author jsholl
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public abstract class BaseAction extends Action implements IActionDelegate {
-
-	protected IStructuredSelection selection = null;
-
-	protected IWorkbenchWindow getWorkbenchWindow() {
-		return J2EEUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public void setSelection(IStructuredSelection selection) {
-		this.selection = selection;
-	}
-
-	public void run() {
-		Shell shell = getWorkbenchWindow().getShell();
-		if (null == selection) {
-			ISelection autoselection = getWorkbenchWindow().getSelectionService().getSelection();
-			if (autoselection instanceof IStructuredSelection)
-				this.selection = (IStructuredSelection) autoselection;
-		}
-
-		try {
-			primRun(shell);
-			this.selection = null;
-		} catch (Throwable t) {
-			Logger.getLogger().logError(t);
-			String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
-			String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
-			ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
-		}
-
-	}
-
-	protected abstract void primRun(Shell shell);
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-		//dispose
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-		//init
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection aSelection) {
-		setSelection((IStructuredSelection) aSelection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run();
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		run();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ComponentEditorInput.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ComponentEditorInput.java
deleted file mode 100644
index 1f2bba954..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ComponentEditorInput.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.actions;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ComponentEditorInput implements IEditorInput {
-
-	private IVirtualComponent component;
-	
-	public ComponentEditorInput(IVirtualComponent  component){
-		this.component = component;
-	}
-	
-	public boolean exists() {
-		return component.exists();
-	}
-
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-
-	public String getName() {
-		return component.getName();
-	}
-
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-
-	public String getToolTipText() {
-		return ""; //$NON-NLS-1$
-	}
-
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-	public IVirtualComponent getComponent(){
-		return component;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ForceClasspathUpdateAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ForceClasspathUpdateAction.java
deleted file mode 100644
index 0122ba5e5..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ForceClasspathUpdateAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c)2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.ui.IActionDelegate;
-
-public class ForceClasspathUpdateAction extends Action implements IActionDelegate{
-
-	private List projectsList = new ArrayList();
-	
-	public void run() {
-		J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectsList);
-	}
-
-	public void run(IAction action) {
-		J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectsList);
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(setSelection(selection));
-	}
-	
-	private boolean setSelection(ISelection selection){
-		projectsList.clear();
-		if(selection != null && selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-			if (structuredSelection.size() > 0) {
-	            Iterator iterator = structuredSelection.iterator();
-	            while(iterator.hasNext()){
-		            Object next = iterator.next();
-		            if (next instanceof IProject) {
-		            	projectsList.add(next);
-		            } else {
-		            	projectsList.clear();
-		            	return false;
-		            }
-	            }
-	        } else { // empty selection
-	        	return false;
-	        }
-	        return true;
-		}
-		return false;
-	}
-	
-	
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java
deleted file mode 100644
index e25fc0c3a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.actions;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-
-/**
- * Insert the type's description here. Creation date: (9/6/2001 12:23:02 PM)
- * 
- * @author: Administrator
- */
-public interface IJ2EEUIContextIds {
-	//	 New creation wizards
-	public static final String NEW_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_NEW_EAR_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String NEW_EAR_ADD_MODULES_PAGE = J2EEUIPlugin.PLUGIN_ID + ".NEW_EAR_ADD_MODULES_PAGE"; //$NON-NLS-1$
-	public static final String NEW_EAR_COMP_PAGE = J2EEUIPlugin.PLUGIN_ID + ".NEW_EAR_COMP_PAGE"; //$NON-NLS-1$
-	public static final String EAR_NEW_MODULE_PROJECTS_PAGE = J2EEUIPlugin.PLUGIN_ID + ".EAR_NEW_MODULE_PROJECTS_PAGE"; //$NON-NLS-1$
-	public static final String NEW_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String NEW_APPCLIENT_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3"; //$NON-NLS-1$
-	public static final String NEW_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String NEW_EJB_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE2"; //$NON-NLS-1$
-	public static final String NEW_EJB_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE3"; //$NON-NLS-1$
-	public static final String NEW_CONNECTOR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".JCA_NEWIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String NEW_CONNECTOR_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".JCA_NEWIZARD_PAGE3"; //$NON-NLS-1$
-	public static final String NEW_JAVA_COMPONENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_JAVA_COMPONENT_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String NEW_JAVA_CLASS_OPTION_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_JAVA_CLASS_OPTION_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String NEW_UTILITY_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_UTILITY_WIZARD_P1"; //$NON-NLS-1$
-	public static final String NEW_UTILITY_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".NEW_UTILITY_WIZARD_P3"; //$NON-NLS-1$
-	
-	// Import, export wizards
-	public static final String IMPORT_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String IMPORT_EAR_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE2"; //$NON-NLS-1$
-	public static final String IMPORT_EAR_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE3"; //$NON-NLS-1$
-	public static final String IMPORT_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String IMPORT_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_IMPORT_EJB_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String IMPORT_RAR_WIZARD_PAGE = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_RAR_WIZARD_PAGE"; //$NON-NLS-1$
-	public static final String IMPORT_UTILITY_JAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_UTILITY_JAR_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String IMPORT_UTILITY_JAR_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_UTILITY_JAR_WIZARD_PAGE2"; //$NON-NLS-1$
-	public static final String IMPORT_CLASS_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_CLASS_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String IMPORT_CLASS_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_CLASS_WIZARD_PAGE2"; //$NON-NLS-1$
-
-	public static final String EXPORT_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_EXPORT_PAGE1"; //$NON-NLS-1$ 
-	public static final String EXPORT_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
-	public static final String EXPORT_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_EXPORT_PAGE1"; //$NON-NLS-1$
-	public static final String EXPORT_RAR_WIZARD_PAGE = J2EEUIPlugin.PLUGIN_ID + ".EXPORT_RAR_WIZARD_PAGE"; //$NON-NLS-1$
-
-	// dialogs
-	public static final String DELEATE_EAR_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm2000"; //$NON-NLS-1$
-	public static final String DELEATE_MODULE_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm2010"; //$NON-NLS-1$
-	public static final String RENAME_EAR_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm3000"; //$NON-NLS-1$
-	public static final String RENAME_MODULE_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm3010"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ImportClassesAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ImportClassesAction.java
deleted file mode 100644
index abff48694..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ImportClassesAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author jsholl
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportClassesAction extends WTPBaseAction {
-
-	public static String LABEL = J2EEUIMessages.getResourceString("Import_Classes"); //$NON-NLS-1$
-
-	public ImportClassesAction() {
-		super();
-		setText(LABEL);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void primRun(Shell shell) {
-		IProject project = ProjectUtilities.getProject(getSelection().getFirstElement());
-		ClassesImportWizard wizard = new ClassesImportWizard(project);
-
-
-		wizard.init(PlatformUI.getWorkbench(), StructuredSelection.EMPTY);
-		wizard.setDialogSettings(J2EEUIPlugin.getDefault().getDialogSettings());
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-
-		dialog.create();
-		dialog.getShell().setSize(550, 550);
-		dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java
deleted file mode 100644
index 4a833892f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteAction.java
+++ /dev/null
@@ -1,419 +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.j2ee.internal.actions;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.jst.j2ee.internal.dialogs.DeleteEARDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.DeleteModuleDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EEDeleteDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EEDeleteUIConstants;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.actions.DeleteResourceAction;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class J2EEDeleteAction extends SelectionDispatchAction implements J2EEDeleteUIConstants {
-
-	protected Shell shell;
-	//Used for EAR delete
-	protected Set referencedProjects;
-	protected List projects;
-	protected DeleteOptions options;
-	// added for IRefactoringAction behavior
-	protected ISelectionProvider provider = null;
-
-
-
-	/**
-	 * Constructor for DeleteModuleAction.
-	 * 
-	 * @param text
-	 */
-	public J2EEDeleteAction(IWorkbenchSite site, Shell parent) {
-		super(site);
-		setText(DELETE);
-		shell = parent;
-	}
-
-	public J2EEDeleteAction(IWorkbenchSite site, ISelectionProvider newProvider) {
-		super(site);
-		setText(DELETE);
-		shell = J2EEUIPlugin.getActiveWorkbenchWindow().getShell();
-		provider = newProvider;
-	}
-
-	protected void reset() {
-		referencedProjects = null;
-		projects = null;
-		options = null;
-	}
-
-	protected boolean getEnableStateBasedOnSelection(IStructuredSelection selection) {
-		if (selection.isEmpty())
-			return false;
-		return isSelectionApplicable() && isSelectionSomeJ2EE();
-	}
-
-	/**
-	 * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected void updateSelection(IStructuredSelection selection) {
-		update(selection);
-	}
-
-	protected boolean isSelectionApplicable() {
-		IStructuredSelection sel = (StructuredSelection) getSelection();
-		Iterator it = sel.iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (!isJ2EEModule(o) && !isApplication(o) && !isProjectOrJavaProject(o))
-				return false;
-		}
-		return true;
-	}
-
-	protected boolean isSelectionSomeJ2EE() {
-		IStructuredSelection sel = (StructuredSelection) getSelection();
-		Iterator it = sel.iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (isJ2EEModule(o) || isApplication(o))
-				return true;
-		}
-		return false;
-	}
-
-
-	protected boolean isSelectionAllDDRoots() {
-		IStructuredSelection sel = (StructuredSelection) getSelection();
-		Iterator it = sel.iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (!isJ2EEModule(o))
-				return false;
-		}
-		return true;
-	}
-
-	protected boolean isSelectionAllApplications() {
-		IStructuredSelection sel = (StructuredSelection) getSelection();
-		Iterator it = sel.iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (!isApplication(o))
-				return false;
-		}
-		return true;
-	}
-
-	protected boolean isJ2EEModule(Object o) {
-		//TODO switch to virtual comp
-//		if (o instanceof WorkbenchComponent) {
-//			WorkbenchComponent module = (WorkbenchComponent) o;
-//			String moduleType = module.getComponentType().getComponentTypeId();
-//			//TODO need to add connector, app client, ear, ejb client
-//			return moduleType.equals(IModuleConstants.JST_WEB_MODULE) || moduleType.equals(IModuleConstants.JST_EJB_MODULE);
-//		}
-		return CommonUtil.isDeploymentDescriptorRoot(o, false);
-	}
-
-	protected boolean isApplication(Object o) {
-		return (o instanceof Application) || isJ2EEApplicationProject(o);
-	}
-
-	protected boolean isProjectOrJavaProject(Object o) {
-		return (o instanceof IProject) || (o instanceof IJavaProject);
-	}
-
-	protected List getProjects() {
-		if (projects == null) {
-			projects = new ArrayList();
-			IStructuredSelection sel = (StructuredSelection) getSelection();
-			Iterator iterator = sel.iterator();
-			IProject project = null;
-			Object o = null;
-			while (iterator.hasNext()) {
-				o = iterator.next();
-				if (o instanceof IJavaProject)
-					o = ((IJavaProject) o).getProject();
-				if (o instanceof IProject) {
-					projects.add(o);
-					addEJBClientProjectIfNecessary((IProject) o, projects);
-				} else if (o instanceof EObject) {
-					EObject obj = (EObject) o;
-					project = ProjectUtilities.getProject(obj);
-					if (project == null)
-						throw new RuntimeException(J2EEUIMessages.getResourceString("Project_should_not_be_null_1_EXC_")); //$NON-NLS-1$
-					projects.add(project);
-					addEJBClientProjectIfNecessary(project, projects);
-				} else {
-					throw new RuntimeException(J2EEUIMessages.getResourceString("Non-project_in_selection_2_EXC_")); //$NON-NLS-1$
-				}
-			}
-		}
-		return projects;
-	}
-
-	/**
-	 * @param project
-	 * @param localProjects
-	 */
-	private void addEJBClientProjectIfNecessary(IProject project, List localProjects) {
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		EJBArtifactEdit edit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
-		if (edit != null && edit.hasEJBClientJARProject())
-			localProjects.add(edit.getEJBClientJarModule().getProject());
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		try {
-			J2EEDeleteDialog dlg = null;
-			if (isSelectionAllApplications())
-				dlg = new DeleteEARDialog(shell, getReferencedProjects());
-			else if (isSelectionAllDDRoots())
-				dlg = new DeleteModuleDialog(shell);
-			else {
-				if (confirmStandardDelete())
-					runResourceDeleteAction();
-				return;
-			}
-
-			dlg.open();
-			if (dlg.getReturnCode() == Window.CANCEL)
-				return;
-			options = dlg.getDeleteOptions();
-			if (options != null)
-				options.setSelectedProjects(getProjects());
-			else
-				return;
-			if (!(ensureEditorsSaved() && validateState()))
-				return;
-			deleteProjectsIfNecessary();
-			deleteMetadataIfNecessary();
-			presentStatusIfNeccessary();
-		} finally {
-			reset();
-		}
-	}
-
-	private boolean ensureEditorsSaved() {
-		return CommonEditorUtility.promptToSaveAllDirtyEditors();
-	}
-
-	protected boolean confirmStandardDelete() {
-		return MessageDialog.openConfirm(shell, DELETE_PROJECTS, CUSTOM_DELETE_MIX_MATCH);
-	}
-
-	protected Set getReferencedProjects() {
-		if (referencedProjects == null)
-			computeReferencedProjects();
-		return referencedProjects;
-	}
-
-	protected void computeReferencedProjects() {
-		//TODO fix up to use components
-//		getProjects();
-//		referencedProjects = new HashSet();
-//		for (int i = 0; i < projects.size(); i++) {
-//			IProject project = (IProject) projects.get(i);
-//			EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-//			if (runtime == null)
-//				continue;
-//			EAREditModel editModel = runtime.getEarEditModelForRead(this);
-//			try {
-//				referencedProjects.addAll(editModel.getModuleMappedProjects());
-//			} finally {
-//				editModel.releaseAccess(this);
-//			}
-//		}
-	}
-
-//	protected DeleteModuleOperation getDeleteModuleOperation() {
-//		if (deleteModuleOperation == null)
-//			deleteModuleOperation = new DeleteModuleOperation(options);
-//		return deleteModuleOperation;
-//	}
-
-	protected void deleteMetadataIfNecessary() {
-		if (!shouldDeleteMetaData())
-			return;
-
-//		IRunnableWithProgress runnable = WTPUIPlugin.getRunnableWithProgress(getDeleteModuleOperation());
-//		ProgressMonitorDialog monitorDialog = new ProgressMonitorDialog(shell);
-//
-//		try {
-//			monitorDialog.run(false, false, runnable);
-//		} catch (InvocationTargetException e) {
-//			handleException(e);
-//		} catch (InterruptedException e) {
-//			//Ignore
-//		}
-	}
-
-	protected boolean shouldDeleteMetaData() {
-		if (deleteProjectsFailedOrCancelled())
-			return false;
-		return primShouldDeleteMetaData();
-	}
-
-	protected boolean primShouldDeleteMetaData() {
-		return options != null && (options.shouldDeleteModules() || options.shouldDeleteModuleDependencies());
-	}
-
-	protected boolean deleteProjectsFailedOrCancelled() {
-		if (options == null || !options.shouldDeleteProjects())
-			return false;
-		return deletedProjectsExist();
-	}
-
-	protected boolean deletedProjectsExist() {
-		List deletedProjects = options.getAllProjectsToDelete();
-		for (int i = 0; i < deletedProjects.size(); i++) {
-			IProject project = (IProject) deletedProjects.get(i);
-			if (project.exists())
-				return true;
-		}
-		return false;
-	}
-
-	protected void deleteProjectsIfNecessary() {
-		if (options.shouldDeleteProjects())
-			runResourceDeleteAction();
-	}
-
-	protected void runResourceDeleteAction() {
-		DeleteResourceAction action = new DeleteResourceAction(shell);
-		List localProjects = null;
-		if (options == null)
-			localProjects = getProjects();
-		else
-			localProjects = options.getAllProjectsToDelete();
-		Iterator it = localProjects.iterator();
-		while (it.hasNext()) {
-			IProject p = (IProject) it.next();
-			if (!p.exists())
-				it.remove();
-		}
-		IStructuredSelection sel = new StructuredSelection(localProjects);
-		action.selectionChanged(sel);
-		action.run();
-	}
-
-	public void handleException(InvocationTargetException e) {
-		Logger.getLogger().logError(e);
-		IStatus status = J2EEPlugin.newErrorStatus(IStatus.ERROR, DELETE_ERROR, e);
-		ErrorDialog.openError(shell, DELETE_ERROR, DELETE_NOT_COMPLETED, status);
-	}
-
-	/**
-	 * Update the action's enable state according to the current selection of the used selection
-	 * provider.
-	 */
-	public void update() {
-		IStructuredSelection selection = null;
-
-		if (provider != null) {
-			selection = (IStructuredSelection) provider.getSelection();
-			selectionChanged((ISelection) selection);
-		} else {
-			selection = (IStructuredSelection) getSelection();
-
-			if (selection == null) {
-				setEnabled(false);
-			} else {
-				updateSelection(selection);
-			}
-		}
-	}
-
-	protected boolean isJ2EEApplicationProject(Object o) {
-		if (o instanceof IProject) {
-			IProject project = (IProject) o;
-			if (J2EEProjectUtilities.isEARProject(project))
-				return true;
-		}
-		return false;
-	}
-
-	protected void setEnabledFromSelection(IStructuredSelection selection) {
-		if (selection == null) {
-			setEnabled(false);
-		} else {
-			setEnabled(getEnableStateBasedOnSelection(selection));
-		}
-	}
-
-	/**
-	 * @see SelectionDispatchAction#selectionChanged(ISelection)
-	 */
-	public void selectionChanged(ISelection selection) {
-		if (selection instanceof IStructuredSelection)
-			setEnabledFromSelection((IStructuredSelection) selection);
-		else
-			super.selectionChanged(selection);
-	}
-
-	protected boolean validateState() {
-		// TODO Fix validateState
-		//		if (!primShouldDeleteMetaData())
-		//			return true;
-		//		
-		//		IValidateEditListener listener = new ValidateEditListener(null,
-		// getDeleteModuleOperation().getDeleteEditModel());
-		//		listener.setShell(shell);
-		//		return listener.validateState().isOK();
-		return true;
-	}
-
-	protected void presentStatusIfNeccessary() {
-		IStatus status = null;
-//		if (deleteModuleOperation != null)
-//			status = deleteModuleOperation.getStatus();
-
-		if (status == null || status.isOK())
-			return;
-
-		ErrorDialog.openError(shell, null, null, status, IStatus.ERROR);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java
deleted file mode 100644
index 97d00f3d1..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Jun 16, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author mdelder
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EEDeleteModuleActionPopulator {//implements WTPOperationDataModelUICreator {
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.extension.ui.WTPOperationDataModelUICreator#createDataModel(java.lang.String,
-	 *      java.lang.String, org.eclipse.jface.viewers.IStructuredSelection,
-	 *      org.eclipse.ui.IWorkbenchSite)
-	 */
-	public IDataModel createDataModel(String extendedOperationId, String operationClass, IStructuredSelection selection, IWorkbenchSite site) {
-		//TODO fix up
-//		J2EEDeleteAction deleteAction = new J2EEDeleteAction(site, (ISelectionProvider) null);
-//		WTPOperationDataModel dataModel = IActionWTPOperationDataModel.createDataModel(deleteAction, selection, site.getSelectionProvider(), site.getShell());
-//		return dataModel;
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
deleted file mode 100644
index 47b6593e9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.deploy.DeployerRegistry;
-import org.eclipse.jst.j2ee.internal.deploy.J2EEDeployOperation;
-import org.eclipse.jst.j2ee.internal.dialogs.RuntimeSelectionDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEDeployAction extends BaseAction {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.ui.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void primRun(Shell shell) {
-
-		if (checkEnabled(shell)) {
-			final IStructuredSelection deploySelection = selection;
-			Job deployJob = new Job("Deploy") {
-				protected IStatus run(IProgressMonitor monitor) {
-					IStatus result = null;
-					J2EEDeployOperation op = new J2EEDeployOperation(deploySelection.toArray());
-					try {
-						result = op.execute(monitor, null);
-					} catch (Exception e) {
-						result = new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, IStatus.ERROR, WTPResourceHandler.getString("27"), e); //$NON-NLS-1$
-						Logger.getLogger().logError(e);
-					} finally {
-						
-					}
-					return result;
-				}
-			};
-			
-			
-			try {
-				deployJob.setUser(true);
-				deployJob.schedule();
-			} catch (Exception e) {
-				//Ignore
-			}
-			
-		}
-
-	}
-
-	/*
-	 *  
-	 */
-	public J2EEDeployAction() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection aSelection) {
-		super.selectionChanged(action, aSelection);
-		action.setEnabled(true);
-	}
-
-	
-	public boolean checkEnabled(Shell shell) {
-
-		try {
-			DeployerRegistry reg = DeployerRegistry.instance();
-
-			List components = DeployerRegistry.getSelectedModules(selection.toArray());
-			for (int i = 0; i < components.size(); i++) {
-				IVirtualComponent component = (IVirtualComponent) components.get(i);
-				IProject proj = component.getProject();
-				if (proj == null) {
-					displayMessageDialog(J2EEUIMessages.getResourceString("DEPLOY_PROJECT_NOT_FOUND") , shell);
-					return false;
-				}
-				
-				IRuntime runtime = J2EEProjectUtilities.getServerRuntime(proj);
-				if (runtime == null) {
-					String message = MessageFormat.format(J2EEUIMessages.getResourceString("DEPLOY_RUNTIME_NOT_FOUND"), new String []{proj.getName()});
-					RuntimeSelectionDialog selectionDialog = new RuntimeSelectionDialog(shell, 
-							J2EEUIMessages.getResourceString("DEPLOY_DIALOG_TITLE"), 
- 								null /* default image */, 
- 								message, 
- 								MessageDialog.ERROR, 
- 								new String[] { IDialogConstants.OK_LABEL }, 0, proj) ;
-					selectionDialog.open();
-					runtime = J2EEProjectUtilities.getServerRuntime(proj);
-					if (runtime == null)
-						return false;
-				}
-				List visitors = reg.getDeployModuleExtensions(proj, runtime);
-				if (visitors.isEmpty()) {
-					displayMessageDialog(MessageFormat.format(J2EEUIMessages.getResourceString("DEPLOY_PROJECT_NOT_SUPPORTED"), new String []{proj.getName()}), shell);
-					return false;
-				}
-				
-			}
-			
-			return true;
-		} catch (CoreException e) {
-			System.out.println("Deploy Action recovering from problem verifying enablement."); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-		return false;
-	}
-	
-	private void displayMessageDialog(String message, Shell shell) {
-		 String title = J2EEUIMessages.getResourceString("DEPLOY_DIALOG_TITLE");
-		 MessageDialog dialog = new MessageDialog(shell, 
-				 								title, 
-				 								null /* default image */, 
-				 								message, 
-				 								MessageDialog.ERROR, 
-				 								new String[] { IDialogConstants.OK_LABEL }, 0) ;
-	     dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.java
deleted file mode 100644
index e4f227f29..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEModuleRenameChange.java
+++ /dev/null
@@ -1,147 +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
- *******************************************************************************/
-/*
- * Created on Sep 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-
-/**
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EEModuleRenameChange extends Change {
-
-//	private String newName;
-	private IProject target;
-//	private boolean renameDependencies;
-
-	public J2EEModuleRenameChange(IProject target, String newName, boolean renameDependencies) {
-		this.target = target;
-//		this.newName = newName;
-//		this.renameDependencies = renameDependencies;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#getName()
-	 */
-	public String getName() {
-		return J2EERenameUIConstants.RENAME_MODULES;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#initializeValidationData(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		//Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#isValid(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		if (target != null)
-			return RefactoringStatus.create(Status.OK_STATUS);
-		return RefactoringStatus.create(new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID, 0, "", null)); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-//		try {
-
-//			RenameModuleOperation renameOp = new RenameModuleOperation(getRenameOptions());
-//			renameOp.run(pm);
-
-			//String contextRoot = getServerContextRoot();
-			// TODO fix up rename and context root operations
-			//if (webNature != null) {
-				//new UpdateWebContextRootMetadataOperation(newTarget, webNature.getContextRoot()).run(pm);
-//			if(contextRoot.equals("") == false){ //$NON-NLS-1$
-//				new UpdateWebContextRootMetadataOperation(target, contextRoot).run(pm);
-//			} else if (J2EENature.getRegisteredRuntime(target) == null)
-//				new RenameUtilityJarMetadataOperation(target, newTarget).run(pm);
-//		} catch (InvocationTargetException e) {
-//			//Ignore
-//		} catch (InterruptedException e) {
-//			//Ignore
-//		}
-		return null;
-	}
-	
-	protected String getServerContextRoot() {
-		WebArtifactEdit webEdit = null;
-		try{
-			webEdit = WebArtifactEdit.getWebArtifactEditForRead(target);
-       		if (webEdit != null)
-       			return webEdit.getServerContextRoot();			
-		} finally {
-			if (webEdit != null )
-				webEdit.dispose();
-		}	
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @return
-	 */
-	/**@deprecated 
-	 * If this method is not used it should be removed at a later time, marking as deprecated
-	 * Warning cleanup 12/07/2005
-	 */
-//	private RenameOptions getRenameOptions() {
-//		RenameOptions options = new RenameOptions();
-//		options.setNewName(this.newName);
-//		options.setSelectedProjects(Collections.singletonList(this.target));
-//		// TODO check module type for EAR type
-//		//options.setIsEARRename(EARNatureRuntime.getRuntime(this.target) != null);
-//		options.setRenameModuleDependencies(this.renameDependencies);
-//		options.setRenameModules(true);
-//		options.setRenameProjects(false);
-//		return options;
-//	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#getModifiedElement()
-	 */
-	public Object getModifiedElement() {
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java
deleted file mode 100644
index 3890197bd..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java
+++ /dev/null
@@ -1,391 +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.j2ee.internal.actions;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants;
-import org.eclipse.jst.j2ee.internal.dialogs.RenameModuleDialog;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.RenameResourceAction;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-
-public class J2EERenameAction extends SelectionDispatchAction implements J2EERenameUIConstants {
-
-	protected Shell shell;
-	//Used for EAR rename
-	protected Set referencedProjects;
-	protected List modules;
-	protected RenameOptions options;
-	// added for IRefactoringAction behavior
-	protected ISelectionProvider provider = null;
-//	protected RenameModuleOperation renameModuleOperation = null;
-
-	/**
-	 * Constructor for RenameModuleAction.
-	 * 
-	 * @param text
-	 */
-	public J2EERenameAction(IWorkbenchSite site, Shell parent) {
-		super(site);
-		setText(RENAME);
-		shell = parent;
-	}
-
-	public J2EERenameAction(IWorkbenchSite site, ISelectionProvider newProvider) {
-		super(site);
-		setText(RENAME);
-		shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		provider = newProvider;
-	}
-
-	protected void reset() {
-//		if (renameModuleOperation != null) {
-//			renameModuleOperation.release();
-//			renameModuleOperation = null;
-//		}
-		referencedProjects = null;
-		modules = null;
-		options = null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.actions.SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected void updateSelection(IStructuredSelection selection) {
-		super.update(selection);
-	}
-
-	/**
-	 * @see SelectionDispatchAction#selectionChanged(ISelection)
-	 */
-	public void selectionChanged(ISelection selection) {
-		if (selection instanceof IStructuredSelection)
-			setEnabledFromSelection((IStructuredSelection) selection);
-		else
-			super.selectionChanged(selection);
-	}
-
-	protected void setEnabledFromSelection(IStructuredSelection selection) {
-		if (selection == null) {
-			setEnabled(false);
-		} else {
-			if (selection.toList().size() != 1) {
-				setEnabled(false);
-			} else {
-				setEnabled(getEnableStateBasedOnSelection(selection));
-			}
-		}
-	}
-
-	protected boolean getEnableStateBasedOnSelection(IStructuredSelection selection) {
-		if (selection.isEmpty())
-			return false;
-		return isSelectionAllDDRoots() || isSelectionAllApplications();
-	}
-
-	protected boolean isSelectionAllDDRoots() {
-		IStructuredSelection sel = (StructuredSelection) getSelection();
-		Iterator it = sel.iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			//TODO check for j2ee workbench module selection
-			if (!CommonUtil.isDeploymentDescriptorRoot(o, false) /*&& !isJ2EEProject(o)*/)
-				return false;
-		}
-		return true;
-	}
-
-	protected boolean isSelectionAllApplications() {
-		IStructuredSelection sel = (StructuredSelection) getSelection();
-		Iterator it = sel.iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (!(o instanceof Application) && !isJ2EEApplicationProject(o))
-				return false;
-		}
-		return true;
-	}
-
-
-	protected List getModules() {
-		if (modules == null) {
-			modules = new ArrayList();
-			IStructuredSelection sel = (StructuredSelection) getSelection();
-			Iterator iterator = sel.iterator();
-			WorkbenchComponent module = null;
-			Object o = null;
-			while (iterator.hasNext()) {
-				o = iterator.next();
-				if (o instanceof WorkbenchComponent) {
-					modules.add(o);
-				} else if (o instanceof EObject) {
-					EObject obj = (EObject) o;
-					IProject project = ProjectUtilities.getProject(obj);
-					StructureEdit moduleCore = null;
-					try {
-						moduleCore = StructureEdit.getStructureEditForRead(project);
-						URI uri = obj.eResource().getURI();
-						ComponentResource[] resources = moduleCore.findResourcesBySourcePath(uri);
-						for (int i=0; i<resources.length; i++) {
-							module = resources[i].getComponent();
-							if (module !=null)
-								break;
-						}
-						if (module == null)
-							throw new RuntimeException(J2EEUIMessages.getResourceString("Project_should_not_be_null_1_ERROR_")); //$NON-NLS-1$
-						modules.add(module);
-					} catch (UnresolveableURIException e) {
-						//Ignore
-					} finally {
-						if (moduleCore !=null)
-							moduleCore.dispose();
-					}
-				} else {
-					throw new RuntimeException(J2EEUIMessages.getResourceString("Non-project_in_selection_2_ERROR_")); //$NON-NLS-1$
-				}
-			}
-		}
-		return modules;
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		try {
-			List localModules = getModules();
-			if (localModules.size() != 1)
-				return;
-			WorkbenchComponent module = (WorkbenchComponent) localModules.get(0);
-			J2EERenameDialog dlg = null;
-
-			// if all we are doing is renaming an EAR, let the base platform do it
-			if (isSelectionAllApplications()) {
-				RenameResourceAction action = new RenameResourceAction(shell);
-				action.selectionChanged(new StructuredSelection(module));
-				action.run();
-			} else {
-				String contextRoot = ""; //$NON-NLS-1$
-				//TODO add context root to the module model
-				//contextRoot = module.getServerContextRoot();
-				dlg = new RenameModuleDialog(shell, module.getName(), contextRoot);
-				dlg.open();
-				if (dlg.getReturnCode() == Window.CANCEL)
-					return;
-
-				options = dlg.getRenameOptions();
-				if (options != null)
-					options.setSelectedProjects(localModules);
-
-				if (!(ensureEditorsSaved() && validateState()))
-					return;
-				renameProjectsIfNecessary();
-				renameMetadataIfNecessary();
-				presentStatusIfNeccessary();
-			}
-		} finally {
-			reset();
-		}
-	}
-
-
-	private boolean ensureEditorsSaved() {
-		return CommonEditorUtility.promptToSaveAllDirtyEditors();
-	}
-
-	protected Set getReferencedProjects() {
-		if (referencedProjects == null)
-			computeReferencedProjects();
-		return referencedProjects;
-	}
-
-	protected void computeReferencedProjects() {
-		getModules();
-		referencedProjects = new HashSet();
-		for (int i = 0; i < modules.size(); i++) {
-			//WorkbenchComponent module = (WorkbenchComponent) modules.get(i);
-			//TODO fix up code here for modules instead of projects
-//			EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
-//			if (runtime == null)
-//				continue;
-//			EAREditModel editModel = runtime.getEarEditModelForRead(this);
-//			try {
-//				referencedProjects.addAll(editModel.getModuleMappedProjects());
-//			} finally {
-//				editModel.releaseAccess(this);
-//			}
-		}
-	}
-
-	protected void renameMetadataIfNecessary() {
-		if (!shouldRenameMetaData())
-			return;
-//		RenameModuleOperation op = getRenameModuleOperation();
-//		IRunnableWithProgress runnable = WTPUIPlugin.getRunnableWithProgress(op);
-//		ProgressMonitorDialog monitorDialog = new ProgressMonitorDialog(shell);
-//
-//		try {
-//			monitorDialog.run(false, false, runnable);
-//		} catch (InvocationTargetException e) {
-//			handleException(e);
-//		} catch (InterruptedException e) {
-//			//Ignore
-//		}
-	}
-
-	protected boolean shouldRenameMetaData() {
-		if (renameProjectsFailedOrCancelled())
-			return false;
-
-		return primShouldRenameMetaData();
-	}
-
-	protected boolean renameProjectsFailedOrCancelled() {
-		if (options == null || !options.shouldRenameProjects())
-			return false;
-		return renamedProjectsExist();
-	}
-
-	protected boolean renamedProjectsExist() {
-		List renamedProjects = options.getAllProjectsToRename();
-		for (int i = 0; i < renamedProjects.size(); i++) {
-			IProject project = (IProject) renamedProjects.get(i);
-			if (project.exists())
-				return true;
-		}
-		return false;
-	}
-
-	protected void renameProjectsIfNecessary() {
-		if (options == null || !options.shouldRenameProjects())
-			return;
-		J2EERenameResourceAction action = new J2EERenameResourceAction(shell);
-		action.setNewName(options.getNewName());
-		IStructuredSelection sel = new StructuredSelection(options.getAllProjectsToRename());
-		action.selectionChanged(sel);
-		action.run();
-
-		// only web projects should have a context root
-		String newContextRoot = options.getNewContextRoot();
-		if (newContextRoot != null && options.shouldRenameProjects()) {
-			//WorkbenchComponent module = (WorkbenchComponent) getModules().get(0);
-			try {
-				// TODO add server context root to the module model
-				//module.setServerContextRoot(newContextRoot);		               		
-			} catch (Throwable t) {
-				//Ignore
-			}
-		}
-	}
-
-	public void handleException(InvocationTargetException e) {
-		Logger.getLogger().logError(e);
-		IStatus status = J2EEPlugin.newErrorStatus(IStatus.ERROR, RENAME_ERROR, e);
-		ErrorDialog.openError(shell, RENAME_ERROR, RENAME_NOT_COMPLETED, status);
-	}
-
-	/**
-	 * Update the action's enable state according to the current selection of the used selection
-	 * provider.
-	 */
-	public void update() {
-		IStructuredSelection selection = null;
-
-		if (provider != null) {
-			selection = (IStructuredSelection) provider.getSelection();
-			super.update(selection);
-		} else {
-			selection = (IStructuredSelection) getSelection();
-
-			if (selection == null) {
-				setEnabled(false);
-			} else {
-				updateSelection(selection);
-			}
-		}
-	}
-
-	protected boolean isJ2EEApplicationProject(Object o) {
-		if (o instanceof IProject) {
-			IProject project = (IProject) o;
-			if (J2EEProjectUtilities.isEARProject(project))
-				return true;
-		}
-		return false;
-	}
-
-	protected boolean validateState() {
-		if (!primShouldRenameMetaData())
-			return true;
-
-//		IValidateEditListener listener = new ValidateEditListener(null, getRenameModuleOperation().getRenameEditModel());
-//		listener.setShell(shell);
-//		return listener.validateState().isOK();
-		return false;
-	}
-
-	protected boolean primShouldRenameMetaData() {
-		return options != null && (options.shouldRenameModules() || options.shouldRenameModuleDependencies());
-	}
-
-//	protected RenameModuleOperation getRenameModuleOperation() {
-//		if (renameModuleOperation == null) {
-//			renameModuleOperation = new RenameModuleOperation(options);
-//		}
-//		return renameModuleOperation;
-//	}
-
-	protected void presentStatusIfNeccessary() {
-		IStatus status = null;
-
-//		if (renameModuleOperation != null) {
-//			status = renameModuleOperation.getStatus();
-//		}
-
-		if (status == null || status.isOK())
-			return;
-
-		ErrorDialog.openError(shell, null, null, status, IStatus.ERROR);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameParticipant.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameParticipant.java
deleted file mode 100644
index e52b7c605..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameParticipant.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Sep 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.dialogs.J2EERenameUIConstants;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-
-
-/**
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class J2EERenameParticipant extends RenameParticipant {
-
-	private static final Class IPROJECT_CLASS = IProject.class;
-
-	public J2EERenameParticipant() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	protected boolean initialize(Object element) {
-		if (element == null)
-			return false;
-
-		IProject project = (IProject) AdaptabilityUtility.getAdapter(element, IPROJECT_CLASS);
-		if (project.isAccessible()) {
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		Object[] targetElements = getProcessor().getElements();
-		if (targetElements == null || targetElements.length != 1)
-			return null;
-		IProject project = (IProject) AdaptabilityUtility.getAdapter(targetElements[0], IPROJECT_CLASS);
-		
-		if (project != null)
-			return new J2EEModuleRenameChange(project, getArguments().getNewName(), getArguments().getUpdateReferences());
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	public String getName() {
-		return J2EERenameUIConstants.RENAME;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException {
-		return RefactoringStatus.create(Status.OK_STATUS);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameResourceAction.java
deleted file mode 100644
index f927e1cac..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameResourceAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.actions;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.RenameResourceAction;
-
-public class J2EERenameResourceAction extends RenameResourceAction {
-	String newName = null;
-
-	/**
-	 * Creates a new action. Using this constructor directly will rename using a dialog (if
-	 * necessary) rather than the inline editor of a ResourceNavigator. Note that a rename happens
-	 * on one and only one resource at a time.
-	 * 
-	 * @param shell
-	 *            the shell for any dialogs
-	 */
-	public J2EERenameResourceAction(Shell shell) {
-		super(shell);
-	}
-
-	/**
-	 * Return the new name to be given to the target resource.
-	 * 
-	 * @return java.lang.String
-	 */
-	protected String queryNewResourceName(final IResource resource) {
-		String retVal = null;
-
-		if (newName == null || newName.length() < 1) {
-			retVal = super.queryNewResourceName(resource);
-		} else {
-			retVal = newName;
-		}
-
-		return retVal;
-	}
-
-	/**
-	 * Gets the newName.
-	 * 
-	 * @return Returns a String
-	 */
-	public String getNewName() {
-		return newName;
-	}
-
-	/**
-	 * Sets the newName.
-	 * 
-	 * @param newName
-	 *            The newName to set
-	 */
-	public void setNewName(String newName) {
-		this.newName = newName;
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEResourceOpenListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEResourceOpenListener.java
deleted file mode 100644
index 2d0657e3b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEResourceOpenListener.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 2, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.OpenEvent;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEResourceOpenListener implements IOpenListener{
-
-	 private OpenJ2EEResourceAction action;
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IOpenListener#open(org.eclipse.jface.viewers.OpenEvent)
-	 */
-	
-	public void open(OpenEvent anEvent) {
-		ISelection selection = anEvent.getSelection();
-		if (selection instanceof IStructuredSelection) {
-		   
-		    if (getAction().updateSelection((IStructuredSelection)selection))
-		    	action.run();
-		}
-		
-	}
-
-	/**
-	 * @return
-	 */
-	private OpenJ2EEResourceAction getAction() {
-		if (action == null) 
-			action = new OpenJ2EEResourceAction();
-		return action;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewAppClientComponentAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewAppClientComponentAction.java
deleted file mode 100644
index b8a2f7e0e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewAppClientComponentAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-public class NewAppClientComponentAction extends AbstractOpenWizardWorkbenchAction {
-
-	// TODO MDE 02-28 Find correct label
-	public static String LABEL = J2EEUIMessages.getResourceString("NewApplClientModuleAction_UI_0"); //$NON-NLS-1$
-	private static final String ICON = "new_appclientproject_wiz"; //$NON-NLS-1$
-
-	public NewAppClientComponentAction() {
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	public NewAppClientComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
-		super(workbench, label, acceptedTypes, false);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	protected Wizard createWizard() {
-		return new AppClientProjectWizard();
-	}
-
-	protected boolean shouldAcceptElement(Object obj) {
-		return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
-	}
-
-	protected String getDialogText() {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewEARComponentAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewEARComponentAction.java
deleted file mode 100644
index 3c96cb23b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewEARComponentAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-public class NewEARComponentAction extends AbstractOpenWizardWorkbenchAction {
-	// TODO MDE 02-28 Find correct label
-	public static String LABEL = J2EEUIMessages.getResourceString("NewEARModuleAction_UI_0"); //$NON-NLS-1$
-	private static final String ICON = "newear_wiz"; //$NON-NLS-1$
-
-	public NewEARComponentAction() {
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	public NewEARComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
-		super(workbench, label, acceptedTypes, false);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	protected Wizard createWizard() {
-		return new EarProjectWizard();
-	}
-
-	protected boolean shouldAcceptElement(Object obj) {
-		return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
-	}
-
-	protected String getDialogText() {
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEArtifactDropDownAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEArtifactDropDownAction.java
deleted file mode 100644
index f92be5c99..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEArtifactDropDownAction.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-
-
-/**
- * A wizard is added to the "New Java EE Artifact" drop down if it has a parameter 'javaeeartifact':
- *     <wizard
- *         name="My Java EE Project Wizard"
- *         icon="icons/wiz.gif"
- *         category="mycategory"
- *         id="xx.MyWizard">
- *         <class class="org.xx.MyWizard">
- *             <parameter name="javaeeartifact" value="true"/>
- *         </class> 
- *         <description>
- *             My Wizard
- *         </description>
- *      </wizard>
- */
-public class NewJavaEEArtifactDropDownAction extends NewJavaEEDropDownAction implements IMenuCreator, IWorkbenchWindowPulldownDelegate2 {
-	
-	private final static String ATT_JAVAEEARTIFACT = "javaeeartifact";//$NON-NLS-1$
-
-	@Override
-	protected String getTypeAttribute() {
-		return ATT_JAVAEEARTIFACT;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEDropDownAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEDropDownAction.java
deleted file mode 100644
index 67d9f3e38..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEDropDownAction.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
-import org.eclipse.jdt.internal.ui.util.PixelConverter;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-import org.eclipse.ui.PlatformUI;
-
-public abstract class NewJavaEEDropDownAction extends Action implements IMenuCreator, IWorkbenchWindowPulldownDelegate2 {
-
-	public static class NewJavaEEWizardAction extends Action implements Comparable {
-
-		private final static String ATT_NAME = "name";//$NON-NLS-1$
-		private final static String ATT_CLASS = "class";//$NON-NLS-1$
-		private final static String ATT_ICON = "icon";//$NON-NLS-1$
-		private final static String TAG_DESCRIPTION = "description";	//$NON-NLS-1$
-
-		private Shell fShell;
-		private IStructuredSelection fSelection;
-		private IConfigurationElement fConfigurationElement;
-		
-		private int menuIndex;
-
-		public NewJavaEEWizardAction(IConfigurationElement element) {
-			fConfigurationElement= element;
-			setText(element.getAttribute(ATT_NAME));
-			
-			String description = getDescriptionFromConfig(fConfigurationElement);
-			setDescription(description);
-			setToolTipText(description);
-			setImageDescriptor(getIconFromConfig(fConfigurationElement));
-			setMenuIndex(getMenuIndexFromConfig(fConfigurationElement));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.action.Action#run()
-		 */
-		public void run() {
-			Shell shell = getShell();
-			try {
-				INewWizard wizard = createWizard();
-				wizard.init(PlatformUI.getWorkbench(), getSelection());
-				
-				WizardDialog dialog = new WizardDialog(shell, wizard);
-				PixelConverter converter = new PixelConverter(JFaceResources.getDialogFont());
-				dialog.setMinimumPageSize(converter.convertWidthInCharsToPixels(70), converter.convertHeightInCharsToPixels(20));
-				dialog.create();
-				int res = dialog.open();
-				
-				notifyResult(res == Window.OK);
-			} catch (CoreException e) {
-				Logger.getLogger().log(e);
-			}
-		}
-		
-		/**
-		 * Returns the configured selection. If no selection has been configured using {@link #setSelection(IStructuredSelection)},
-		 * the currently selected element of the active workbench is returned.
-		 * @return the configured selection
-		 */
-		protected IStructuredSelection getSelection() {
-			if (fSelection == null) {
-				return evaluateCurrentSelection();
-			}
-			return fSelection;
-		}
-		
-		private IStructuredSelection evaluateCurrentSelection() {
-			IWorkbenchWindow window = J2EEUIPlugin.getActiveWorkbenchWindow();
-			if (window != null) {
-				ISelection selection = window.getSelectionService().getSelection();
-				if (selection instanceof IStructuredSelection) {
-					return (IStructuredSelection) selection;
-				}
-			}
-			return StructuredSelection.EMPTY;
-		}
-		
-		/**
-		 * Configures the selection to be used as initial selection of the wizard. 
-		 * @param selection the selection to be set or <code>null</code> to use the selection of the active workbench window
-		 */
-		public void setSelection(IStructuredSelection selection) {
-			fSelection = selection;
-		}
-		
-		/**
-		 * Returns the configured shell. If no shell has been configured using {@link #setShell(Shell)},
-		 * 	the shell of the currently active workbench is returned.
-		 * @return the configured shell
-		 */
-		protected Shell getShell() {
-			if (fShell == null) {
-				return J2EEUIPlugin.getActiveWorkbenchShell();
-			}
-			return fShell;
-		}
-		
-		/**
-		 * Configures the shell to be used as parent shell by the wizard.
-		 * @param shell the shell to be set or <code>null</code> to use the shell of the active workbench window
-		 */
-		public void setShell(Shell shell) {
-			fShell = shell;
-		}
-		
-		private String getDescriptionFromConfig(IConfigurationElement config) {
-			IConfigurationElement [] children = config.getChildren(TAG_DESCRIPTION);
-			if (children.length >= 1) {
-				return children[0].getValue();
-			}
-			return ""; //$NON-NLS-1$
-		}
-
-		private ImageDescriptor getIconFromConfig(IConfigurationElement config) {
-			String iconName = config.getAttribute(ATT_ICON);
-			if (iconName != null) {
-				return J2EEUIPlugin.imageDescriptorFromPlugin(config.getContributor().getName(), iconName);
-			}
-			return null;
-		}
-		
-		private int getMenuIndexFromConfig(IConfigurationElement config) {
-			IConfigurationElement[] classElements = config.getChildren(TAG_CLASS);
-			if (classElements.length > 0) {
-				for (IConfigurationElement classElement : classElements) {
-					IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER);
-					for (IConfigurationElement paramElement : paramElements) {
-						if (ATT_MENUINDEX.equals(paramElement.getAttribute(TAG_NAME))) {
-							return Integer.parseInt(paramElement.getAttribute(TAG_VALUE));
-						}
-					}
-				}
-			}
-			return Integer.MAX_VALUE;
-		}
-		
-		protected INewWizard createWizard() throws CoreException {
-			return (INewWizard) CoreUtility.createExtension(fConfigurationElement, ATT_CLASS);
-		}
-
-		public int getMenuIndex() {
-			return menuIndex;
-		}
-
-		public void setMenuIndex(int menuIndex) {
-			this.menuIndex = menuIndex;
-		}
-
-		public int compareTo(Object o) {
-			NewJavaEEWizardAction action = (NewJavaEEWizardAction) o;
-			return getMenuIndex() - action.getMenuIndex();
-		}
-	}
-	
-	protected final static String TAG_WIZARD = "wizard";//$NON-NLS-1$
-	protected final static String TAG_PARAMETER = "parameter";//$NON-NLS-1$
-	protected final static String TAG_NAME = "name";//$NON-NLS-1$
-	protected final static String TAG_VALUE = "value";//$NON-NLS-1$
-	protected final static String TAG_CLASS = "class"; //$NON-NLS-1$
-	protected final static String ATT_MENUINDEX = "menuIndex";//$NON-NLS-1$
-	protected final static String PL_NEW = "newWizards"; //$NON-NLS-1$
-	
-	protected Menu fMenu;
-	
-	protected Shell fWizardShell;
-	
-	public NewJavaEEDropDownAction() {
-		fMenu = null;
-		setMenuCreator(this);
-	}
-
-	public void dispose() {
-		if (fMenu != null) {
-			fMenu.dispose();
-			fMenu = null;
-		}
-	}
-
-	public Menu getMenu(Menu parent) {
-		return null;
-	}
-
-	public Menu getMenu(Control parent) {
-		if (fMenu == null) {
-			fMenu = new Menu(parent);
-			NewJavaEEWizardAction[] actions = getActionFromDescriptors();
-			for (NewJavaEEWizardAction action : actions) {
-				action.setShell(fWizardShell);
-				ActionContributionItem item = new ActionContributionItem(action);
-				item.fill(fMenu, -1);
-			}			
-		}
-		return fMenu;
-	}
-	
-	public void run() {
-		getDefaultAction().run();
-	}
-	
-	public Action getDefaultAction() {
-		Action[] actions = getActionFromDescriptors();
-		if (actions.length > 0)
-			return actions[0];
-		return null;
-	}
-	
-	public NewJavaEEWizardAction[] getActionFromDescriptors() {
-		ArrayList<NewJavaEEWizardAction> containers = new ArrayList<NewJavaEEWizardAction>();
-		
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(PlatformUI.PLUGIN_ID, PL_NEW);
-		if (extensionPoint != null) {
-			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
-				if (element.getName().equals(TAG_WIZARD) && isJavaEEProjectWizard(element)) {
-					containers.add(new NewJavaEEWizardAction(element));
-				}
-			}
-		}
-		
-		NewJavaEEWizardAction[] actions = (NewJavaEEWizardAction[]) containers.toArray(new NewJavaEEWizardAction[containers.size()]);
-		Arrays.sort(actions);
-		return actions; 
-	}
-		
-	protected boolean isJavaEEProjectWizard(IConfigurationElement element) {
-		IConfigurationElement[] classElements = element.getChildren(TAG_CLASS);
-		if (classElements.length > 0) {
-			for (IConfigurationElement classElement : classElements) {
-				IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER);
-				for (IConfigurationElement paramElement : paramElements) {
-					if (getTypeAttribute().equals(paramElement.getAttribute(TAG_NAME))) {
-						return Boolean.valueOf(paramElement.getAttribute(TAG_VALUE)).booleanValue();
-					}
-				}
-			}
-		}
-		// old way, deprecated
-		if (Boolean.valueOf(element.getAttribute(getTypeAttribute())).booleanValue()) {
-			return true;
-		}
-		return false;
-	}
-		
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		fWizardShell = window.getShell();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		run();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		
-	}
-	
-	protected abstract String getTypeAttribute();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEProjectDropDownAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEProjectDropDownAction.java
deleted file mode 100644
index 490cdaf1b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEProjectDropDownAction.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-
-
-/**
- * A wizard is added to the "New Java EE Project" drop down if it has a parameter 'javaeeproject':
- *     <wizard
- *         name="My Java EE Project Wizard"
- *         icon="icons/wiz.gif"
- *         category="mycategory"
- *         id="xx.MyWizard">
- *         <class class="org.xx.MyWizard">
- *             <parameter name="javaeeproject" value="true"/>
- *         </class> 
- *         <description>
- *             My Wizard
- *         </description>
- *      </wizard>
- */
-public class NewJavaEEProjectDropDownAction extends NewJavaEEDropDownAction implements IMenuCreator, IWorkbenchWindowPulldownDelegate2 {
-	
-	private final static String ATT_JAVAEEPROJECT = "javaeeproject";//$NON-NLS-1$
-
-	@Override
-	protected String getTypeAttribute() {
-		return ATT_JAVAEEPROJECT;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
deleted file mode 100644
index 11989fa95..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.actions;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
-import org.eclipse.jst.j2ee.internal.componentcore.ComponentArchiveOptions;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.BinaryEditorUtilities;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Action for opening a J2EE resource from the J2EE navigator.
- */
-public class OpenJ2EEResourceAction extends AbstractOpenAction {
-	
-	public static final String ID = "org.eclipse.jst.j2ee.internal.internal.ui.actions.OpenJ2EEResourceAction"; //$NON-NLS-1$
-	public static final String JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.java.EnterpriseBeanJavaEditor"; //$NON-NLS-1$
-	public static final String BASE_JAVA_EDITOR_ID = "org.eclipse.jdt.ui.CompilationUnitEditor"; //$NON-NLS-1$
-	
-	protected static IEditorDescriptor javaEditorDescriptor;
-	protected static IEditorDescriptor baseJavaEditorDescriptor;
-
-	/**
-	 * Create an instance of this class
-	 */
-	public OpenJ2EEResourceAction() {
-		super("Open"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the action ID.
-	 */
-	public String getID() {
-		return ID;
-	}
-
-	public static IEditorDescriptor getJavaEditorDescriptor() {
-		if (javaEditorDescriptor == null)
-			javaEditorDescriptor = findEditorDescriptor(JAVA_EDITOR_ID);
-		return javaEditorDescriptor;
-	}
-
-	public static IEditorDescriptor getBaseJavaEditorDescriptor() {
-		if (baseJavaEditorDescriptor == null)
-			baseJavaEditorDescriptor = findEditorDescriptor(BASE_JAVA_EDITOR_ID);
-		return baseJavaEditorDescriptor;
-	}
-	
-	protected void openAppropriateEditor(IVirtualComponent c){
-		if (c == null){
-			return;
-		}
-		IWorkbenchPage page = null;
-		IEditorPart editor = null;
-		try {
-			page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			
-			IEditorInput editorInput = null;
-			
-			//[Bug 237794] if component c is a JEE 5 archive then editorInput needs to be a BinaryEditorInput
-			if (c instanceof VirtualArchiveComponent) {
-				JavaEEQuickPeek qp = JavaEEBinaryComponentHelper.getJavaEEQuickPeek(c);
-				//[Bug 239440] because Connectors are opened with the basic XML editor and not a specialized editor they need binary editor input
-				if( qp.getJavaEEVersion() == JavaEEQuickPeek.JEE_5_0_ID || qp.getType() == JavaEEQuickPeek.CONNECTOR_TYPE) {
-					String path = ((EObject)srcObject).eResource().getURI().toString();
-					editorInput = BinaryEditorUtilities.getBinaryEditorInput((VirtualArchiveComponent)c, path);
-				}
-			} 
-			
-			//this is for all other cases
-			if(editorInput == null) {
-				editorInput = new ComponentEditorInput(c);
-			}
-			
-			editor = page.openEditor(editorInput, currentDescriptor.getId());
-			if (editor instanceof ISetSelectionTarget)
-				((ISetSelectionTarget) editor).selectReveal(getStructuredSelection());
-		} catch (Exception e) {
-			MessageDialog.openError(page.getWorkbenchWindow().getShell(), J2EEUIMessages.getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
-		}
-	}
-	
-	
-	/**
-	 * open the appropriate editor
-	 */
-	protected void openAppropriateEditor(IResource r) {
-		if (r == null)
-			return;
-		IWorkbenchPage page = null;
-		IEditorPart editor = null;
-		try {
-			page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			editor = page.openEditor(new FileEditorInput((IFile) r), currentDescriptor.getId());
-			if (editor instanceof ISetSelectionTarget)
-				((ISetSelectionTarget) editor).selectReveal(getStructuredSelection());
-		} catch (Exception e) {
-			MessageDialog.openError(page.getWorkbenchWindow().getShell(), J2EEUIMessages.getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
-		}
-	}
-	
-	/**
-	 * The user has invoked this action
-	 */
-	public void run() {
-		if (!isEnabled())
-			return;
-		
-		if (srcObject instanceof J2EEJavaClassProviderHelper) {
-			((J2EEJavaClassProviderHelper) srcObject).openInEditor();
-			return;
-		}
-		
-		if( isEJB3BeanObject(srcObject) ){
-			String name = ""; //$NON-NLS-1$
-			if( srcObject instanceof org.eclipse.jst.javaee.ejb.SessionBean ){
-				org.eclipse.jst.javaee.ejb.SessionBean bean = (org.eclipse.jst.javaee.ejb.SessionBean)srcObject;
-				name = bean.getEjbClass();
-			}else if(srcObject instanceof org.eclipse.jst.javaee.ejb.MessageDrivenBean){
-				org.eclipse.jst.javaee.ejb.MessageDrivenBean  bean = (org.eclipse.jst.javaee.ejb.MessageDrivenBean)srcObject;
-				name = bean.getEjbClass();
-			}else if(srcObject instanceof org.eclipse.jst.javaee.ejb.EntityBean){
-				org.eclipse.jst.javaee.ejb.EntityBean bean = (org.eclipse.jst.javaee.ejb.EntityBean)srcObject;
-				name = bean.getEjbClass();
-			}
-
-			IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
-			IProject project = resource.getProject();
-			IJavaProject javaProject = JavaCore.create(project);
-			if(javaProject.exists()){
-				IType type = null;
-				try {
-					//if name is null then can't get type
-					if(name != null) {
-						type = javaProject.findType( name );
-					}
-					
-					//if type is null then can't open its editor, so open editor for the resource
-					if(type != null) {
-						ICompilationUnit cu = type.getCompilationUnit();
-						EditorUtility.openInEditor(cu);
-					} else{
-						openAppropriateEditor(resource);
-					}
-				} catch (JavaModelException e) {
-					J2EEUIPlugin.logError(-1, e.getMessage(), e);
-				} catch (PartInitException e) {
-					J2EEUIPlugin.logError(-1, e.getMessage(), e);
-				}
-
-			}
-			return;
-		}
-		
-		if (srcObject instanceof EObject) {
-			EObject ro = (EObject) srcObject;
-			IProject p = ProjectUtilities.getProject(ro);
-			
-			if (ro instanceof BeanLink) {
-				openBeanLinkInJavaEditor((BeanLink) ro, p);
-				return;
-			}
-			IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
-			if(resource != null && resource.exists()){
-				openAppropriateEditor(resource);
-			} else if(ro.eResource() != null) {
-				ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
-				if (moduleFile != null) {
-					ArchiveOptions options = moduleFile.getOptions();
-					if(options instanceof ComponentArchiveOptions) {
-						IVirtualComponent component = ((ComponentArchiveOptions)options).getComponent();
-						openAppropriateEditor(component);
-					}
-				} else {
-					//if can't get a ModuleFile then get the component from the archive
-					IArchive archive = JavaEEArchiveUtilities.findArchive(ro);
-					if(archive != null) {
-						IVirtualComponent component = JavaEEArchiveUtilities.findComponent(archive);
-						if(component != null){
-							openAppropriateEditor(component);
-						}
-					}
-				}
-			}
-		} else if (srcObject instanceof Resource) {
-			openAppropriateEditor(WorkbenchResourceHelper.getFile((Resource)srcObject));
-		}
-	}
-
-	/**
-	 * The structured selection has changed in the workbench. Subclasses should override this method
-	 * to react to the change. Returns true if the action should be enabled for this selection, and
-	 * false otherwise.
-	 * 
-	 * When this method is overridden, the super method must always be invoked. If the super method
-	 * returns false, this method must also return false.
-	 * 
-	 * @param sel the new structured selection
-	 */
-	public boolean updateSelection(IStructuredSelection s) {
-		if (!super.updateSelection(s))
-			return false;
-
-		// Make sure this is one of the selections we can handle,
-		// then set the source object as is. The run() will do the hard stuff.
-		Object obj = s.getFirstElement();
-
-		if (obj instanceof J2EEJavaClassProviderHelper) {
-			currentDescriptor = getJavaEditorDescriptor();
-		} else if (obj instanceof BeanLink) {
-			currentDescriptor = getBaseJavaEditorDescriptor();	
-		} else if(isEJB3BeanObject(obj)) {
-			//[241685] if it is a EJB 3 bean the class is specially opened by the run() method
-		} else if (obj instanceof EObject) {
-			IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-			IFile file = WorkbenchResourceHelper.getFile((EObject)obj);
-			if(file != null) {
-				/*[235218] if 'obj' is a JavaEE DD file it can only be opened if the file exists
-				 *	if 'obj' is not a DD file, the WorkbenchResourceHelper may still return the DD
-				 *	as the associated file (such as in the case with Beans), thus we must try to get
-				 *	the default editor if 'obj' is not a JavaEE DD file.
-				 */
-				boolean isJavaEEDDFile = isJavaEEDDFile((EObject)obj);
-				boolean isParentJavaEEDDFile = isJavaEEDDFile(getRootObject(obj));
-				//[241685] if file is a DD or its containing parent is a DD then it is open-able as a DD
-				if((isJavaEEDDFile && file.exists()) || (isParentJavaEEDDFile && file.exists())){
-					IContentType contentType = IDE.getContentType(file);
-					currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
-				} else {
-					currentDescriptor = null;
-					return false;
-				}
-			}  else if (((EObject)obj).eResource() != null) {
-				//[Bug 237794] if the file is null then it maybe a binary resource in an archive
-				//	attempt to get the resource from the archive and the content type from that
-				EObject eObj = (EObject) obj;
-				IArchive archive = JavaEEArchiveUtilities.findArchive(eObj);
-				if(archive != null) {
-					IPath path = new Path(((EObject)obj).eResource().getURI().toString());
-					if(archive.containsArchiveResource(path)) {
-						InputStream stream = null;
-						try {
-							IArchiveResource resource = archive.getArchiveResource(path);
-							stream = resource.getInputStream();
-							IContentType type = Platform.getContentTypeManager().findContentTypeFor(stream, path.lastSegment());
-							currentDescriptor = registry.getDefaultEditor(path.lastSegment(),type);
-						} catch (FileNotFoundException e) {
-							J2EEUIPlugin.logError(-1, e.getMessage(), e);
-						} catch (IOException e) {
-							J2EEUIPlugin.logError(-1, e.getMessage(), e);
-						} finally {
-							if(stream != null) {
-								try {
-									stream.close();
-								} catch (IOException e) {
-									J2EEUIPlugin.logError(-1, e.getMessage(), e);
-								}
-							}
-						}
-						
-					}
-				}
-			}
-		}
-		else if (obj instanceof Resource) {
-			IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-			IFile file = WorkbenchResourceHelper.getFile((Resource)obj);
-			IContentType contentType = IDE.getContentType(file);
-			currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
-		}
-		else {
-			currentDescriptor = null;
-			return false;
-		}
-		setAttributesFromDescriptor();
-		srcObject = obj;
-		return true;
-	}
-	
-	/**
-	 * @param link
-	 */
-	private void openBeanLinkInJavaEditor(BeanLink link, IProject p) {
-		String linkName = null;
-		JavaClass javaClass = null;
-		IVirtualComponent comp = ComponentUtilities.findComponent(link);
-		// Handle EJB Link case
-		if (link instanceof EJBLink) {
-			linkName = ((EJBLink) link).getEjbLink();
-			EJBArtifactEdit artifactEdit = null;
-			try {
-				artifactEdit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
-				EJBJar ejbJar = artifactEdit.getEJBJar();
-				if (ejbJar == null)
-					return;
-				EnterpriseBean bean = ejbJar.getEnterpriseBeanNamed(linkName);
-				if (bean == null)
-					return;
-				javaClass = bean.getEjbClass();
-			} finally {
-				if (artifactEdit!=null)
-					artifactEdit.dispose();
-			}
-		}
-		// Handle Servlet Link case
-		else {
-			linkName = ((ServletLink) link).getServletLink();
-			WebArtifactEdit artifactEdit = null;
-			try {
-				artifactEdit = WebArtifactEdit.getWebArtifactEditForRead(comp);
-				WebApp webApp = artifactEdit.getWebApp();
-			if (webApp == null)
-				return;
-			Servlet servlet = webApp.getServletNamed(linkName);
-			if (servlet == null)
-				return;
-			javaClass = servlet.getServletClass();
-			} finally {
-				if (artifactEdit!=null)
-					artifactEdit.dispose();
-			}
-		}
-		// Open java editor on the selected objects associated java file
-		try {
-			J2EEEditorUtility.openInEditor(javaClass, p);
-		} catch (Exception cantOpen) {
-			J2EEUIPlugin.logError(-1, cantOpen.getMessage(), cantOpen);
-		}
-	}
-
-	protected EObject getRootObject(Object obj) {
-		if (obj instanceof EObject) {
-			EObject refObj = (EObject) obj;
-			while (refObj != null && refObj.eContainer() != null)
-				refObj = refObj.eContainer();
-			return refObj;
-		}
-		return null;
-	}
-	
-	/**
-	 * Determine if the given EObject is a JavaEE DD
-	 * [235218] first added
-	 * [241685] Updated to include both pre and post JavaEE 5 DDs
-	 * @param obj
-	 * @return
-	 */
-	private boolean isJavaEEDDFile(EObject obj){
-		boolean isDD =
-			obj instanceof org.eclipse.jst.javaee.ejb.EJBJar ||
-			obj instanceof org.eclipse.jst.javaee.web.WebApp ||
-			obj instanceof org.eclipse.jst.javaee.applicationclient.ApplicationClient ||
-			obj instanceof org.eclipse.jst.javaee.application.Application ||
-			obj instanceof EJBJar ||
-			obj instanceof WebApp ||
-			obj instanceof ApplicationClient ||
-			obj instanceof Connector ||
-			obj instanceof Application;
-		return isDD;
-	}
-	
-	/**
-	 * Determines if the given object is a EJB 3 Bean
-	 * [241685] first added
-	 * 
-	 * @param obj determine weather this object is an EJB 3 bean or not
-	 * @return true if obj is a EJB 3 bean, false otherwise
-	 */
-	private boolean isEJB3BeanObject(Object obj) {
-		boolean isBean =
-			obj instanceof org.eclipse.jst.javaee.ejb.SessionBean ||
-			obj instanceof org.eclipse.jst.javaee.ejb.MessageDrivenBean ||
-			obj instanceof org.eclipse.jst.javaee.ejb.EntityBean;
-		
-		return isBean;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WTPBaseAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WTPBaseAction.java
deleted file mode 100644
index 5433410e9..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WTPBaseAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Jul 7, 2004
- * 
- * TODO To change the template for this generated file go to Window - Preferences - Java - Code
- * Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-
-public abstract class WTPBaseAction extends Action implements IActionDelegate2 {
-	private final static String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
-	private final static String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
-
-	protected IStructuredSelection selection = null;
-
-	protected IWorkbenchWindow getWorkbenchWindow() {
-		return J2EEUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public void setSelection(IStructuredSelection selection) {
-		this.selection = selection;
-	}
-
-	public void run() {
-		Shell shell = getWorkbenchWindow().getShell();
-		if (null == selection) {
-			ISelection autoselection = getWorkbenchWindow().getSelectionService().getSelection();
-			if (autoselection instanceof IStructuredSelection)
-				this.selection = (IStructuredSelection) autoselection;
-		}
-
-		try {
-			primRun(shell);
-			this.selection = null;
-		} catch (Throwable t) {
-			ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
-		}
-
-	}
-
-	protected abstract void primRun(Shell shell);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-		//dispose
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-		//init
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection aSelection) {
-		setSelection((IStructuredSelection) aSelection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run();
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		run();
-	}
-
-	/**
-	 * @return Returns the selection.
-	 */
-	protected IStructuredSelection getSelection() {
-		return selection;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index ec3fac904..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.actions;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * WARNING: This class will be deleted
- * 
- * @deprecated use {@link org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation}
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation {
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
-		super(rule);
-	}
-
-	public WorkspaceModifyComposedOperation() {
-		super();
-	}
-
-	public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
-		super(rule, nestedRunnablesWithProgress);
-	}
-
-	public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
-		super(nestedRunnablesWithProgress);
-	}
-
-	public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
-		super(nestedOp);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.java
deleted file mode 100644
index 3daf2e300..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.classpathdep.ui;
-
-import java.net.URL;
-
-
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-
-public class ClasspathDependencyAttributeConfiguration extends ClasspathAttributeConfiguration {
-
-	private static ImageDescriptor descriptor = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canEdit(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public boolean canEdit(ClasspathAttributeAccess attribute) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public boolean canRemove(ClasspathAttributeAccess attribute) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getImageDescriptor(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public ImageDescriptor getImageDescriptor(ClasspathAttributeAccess attribute) {
-		if (descriptor == null) {
-			final URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage("CPDep"); //$NON-NLS-1$
-			if (gifImageURL != null) {
-				descriptor = ImageDescriptor.createFromURL(gifImageURL);
-			}
-		}
-		return descriptor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getNameLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public String getNameLabel(ClasspathAttributeAccess attribute) {
-		return Resources.nameLabel;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getValueLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public String getValueLabel(ClasspathAttributeAccess attribute) {
-		final IClasspathAttribute attrib = attribute.getClasspathAttribute();
-		if (attrib != null) {
-			final String value = attrib.getValue();
-			if (value != null) {
-				if (value.equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER)) {
-					return Resources.containerMapping;
-				}
-				return value;
-			}
-		}
-		return Resources.unspecified;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performEdit(org.eclipse.swt.widgets.Shell, org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public IClasspathAttribute performEdit(Shell shell,
-			ClasspathAttributeAccess attribute) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public IClasspathAttribute performRemove(ClasspathAttributeAccess attribute) {
-		return JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY, null);
-	}
-
-	private static final class Resources extends NLS {
-        public static String nameLabel;
-        public static String unspecified;
-        public static String containerMapping;
-        static
-        {
-            initializeMessages( ClasspathDependencyAttributeConfiguration.class.getName(), 
-                                Resources.class );
-        }
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.properties
deleted file mode 100644
index 3f050ff33..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 BEA Systems, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     rfrost@bea.com - initial API and implementation
-###############################################################################
-nameLabel = Publish/export dependency
-unspecified = (None)
-containerMapping = Added to parent module
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.java
deleted file mode 100644
index 3d0a77886..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    rfrost@bea.com - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.classpathdep.ui;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-
-/**
- * IMarkerResolutionGenerator for classpath dependency validator problem markers. 
- */
-public final class ClasspathDependencyValidatorMarkerResolutions implements IMarkerResolutionGenerator {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
-	 */
-	public IMarkerResolution[] getResolutions(final IMarker marker) {
-		// generate resolutions based on type of validation problem marker
-		String messageId = null;
-		String cpEntryPath = null;
-		try {
-			messageId = (String) marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_MESSAGEID);
-			cpEntryPath = (String) marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_GROUP);
-		} catch (CoreException ce) {
-			Logger.getLogger(J2EEUIPlugin.PLUGIN_ID).logError(ce);
-			return new IMarkerResolution[0];
-		}
-		
-		if (messageId == null || cpEntryPath == null || cpEntryPath.length() == 0) {
-			return new IMarkerResolution[0];
-		}
-		
-		if (ClasspathDependencyValidator.AppClientProject.equals(messageId)) {
-			// can apply to multiple cp entries so not currently supporting a quick fix...
-		} else if (ClasspathDependencyValidator.DuplicateClassFolderEntry.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };			
-		} else if (ClasspathDependencyValidator.DuplicateArchiveName.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };			
-		} else if (ClasspathDependencyValidator.FilteredContainer.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };			
-		} else if (ClasspathDependencyValidator.InvalidNonWebRuntimePath.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };			
-		} else if (ClasspathDependencyValidator.InvalidWebRuntimePath.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };			
-		} else if (ClasspathDependencyValidator.NonTaggedExportedClasses.equals(messageId)) {
-			// quick fix adds the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, true),
-					new AddClasspathNonDependencyAttributeResolution(cpEntryPath)};	
-		} else if (ClasspathDependencyValidator.ProjectClasspathEntry.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };	
-		} else if (ClasspathDependencyValidator.RootMappingNonEARWARRef.equals(messageId)) {
-			// can apply to multiple cp entries so not currently supporting a quick fix...
-		} else if (ClasspathDependencyValidator.SourceEntry.equals(messageId)) {
-			// quick fix removes the dependency
-			return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };	
-		}
-		
-		return new IMarkerResolution[0];
-    }
-	
-    private static IClasspathEntry getClasspathEntryForMarker(final IMarker marker, final String cpEntryPath) throws CoreException {
-	    final IProject proj = marker.getResource().getProject();
-		if (proj != null && proj.hasNature(JavaCore.NATURE_ID)) {
-			final IJavaProject jProject = JavaCore.create(proj);
-			if (cpEntryPath != null) {
-				IClasspathEntry[] rawCp = jProject.getRawClasspath();
-				for (int i = 0; i < rawCp.length; i++) {
-					if (rawCp[i].getPath().toString().equals(cpEntryPath)) {
-						return rawCp[i];
-					}
-				}
-			}
-    	}
-    	return null;
-    }
-	
-	/* Resolution that add/removes the classpath dependency attribute */
-    private static final class UpdateClasspathDependencyAttributeResolution implements IMarkerResolution {
-        private final boolean add;
-        private final String cpEntryPath;
-        public UpdateClasspathDependencyAttributeResolution(final String cpEntryPath, final boolean add) {
-            this.add = add;
-            this.cpEntryPath = cpEntryPath;
-        }
-        
-        public String getLabel() {
-        	if (add) {
-        		return Resources.addClasspathDependencyAttribute;	
-        	} 
-        	return Resources.removeClasspathDependencyAttribute;
-        }
-
-        public void run(final IMarker marker) {
-    	    final IProject proj = marker.getResource().getProject();
-	    	try {
-	    		final IClasspathEntry cpEntry = getClasspathEntryForMarker(marker, cpEntryPath);
-	    		if (add) {
-	    			UpdateClasspathAttributeUtil.addDependencyAttribute(null, proj.getName(), cpEntry);
-	    		} else {
-	    			UpdateClasspathAttributeUtil.removeDependencyAttribute(null, proj.getName(), cpEntry);	
-	    		}
-	    	} catch (CoreException ce){
-                ErrorDialog.openError(null, Resources.errorDialogTitle,
-                		Resources.errorDialogMessage,
-                		ce.getStatus());
-	    	} catch (ExecutionException ee){
-	    		ErrorDialog.openError(null, Resources.errorDialogTitle,
-	    				Resources.errorDialogMessage,
-	    				new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID, 0, ee.getLocalizedMessage(), ee)); 
-	    	}
-        }        
-    }
-    
-	/* Resolution that adds the classpath nondependency attribute */
-    private static final class AddClasspathNonDependencyAttributeResolution implements IMarkerResolution {
-        private final String cpEntryPath;
-        public AddClasspathNonDependencyAttributeResolution(final String cpEntryPath) {
-            this.cpEntryPath = cpEntryPath;
-        }
-        
-        public String getLabel() {
-        	return Resources.addClasspathNonDependencyAttribute;	
-        }
-
-        public void run(final IMarker marker) {
-    	    final IProject proj = marker.getResource().getProject();
-	    	try {
-	    		final IClasspathEntry cpEntry = getClasspathEntryForMarker(marker, cpEntryPath);
-	    		UpdateClasspathAttributeUtil.addNonDependencyAttribute(null, proj.getName(), cpEntry);
-	    	} catch (CoreException ce){
-                ErrorDialog.openError(null, Resources.errorDialogTitle,
-                		Resources.errorDialogMessage,
-                		ce.getStatus());
-	    	} catch (ExecutionException ee){
-	    		ErrorDialog.openError(null, Resources.errorDialogTitle,
-	    				Resources.errorDialogMessage,
-	    				new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID, 0, ee.getLocalizedMessage(), ee)); 
-	    	}
-        }        
-    }
-    
-    private static final class Resources extends NLS {
-        public static String removeClasspathDependencyAttribute;
-        public static String addClasspathDependencyAttribute;
-        public static String addClasspathNonDependencyAttribute;
-        public static String errorDialogTitle;
-        public static String errorDialogMessage;
-        
-        static
-        {
-            initializeMessages( ClasspathDependencyValidatorMarkerResolutions.class.getName(), 
-                                Resources.class );
-        }
-    }
-    
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.properties
deleted file mode 100644
index c21e5af92..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.properties
+++ /dev/null
@@ -1,15 +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
-###############################################################################
-addClasspathDependencyAttribute = Mark the associated raw classpath entry as a publish/export dependency.
-addClasspathNonDependencyAttribute = Exclude the associated raw classpath entry from the set of potential publish/export dependencies.
-removeClasspathDependencyAttribute = Remove publish/export dependency on the associated raw classpath entry.
-errorDialogTitle = Error
-errorDialogMessage = Failed while applying the quick fix.
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.java
deleted file mode 100644
index 463feca59..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.classpathdep.ui;
-
-import java.net.URL;
-
-
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-
-public class ClasspathNonDependencyAttributeConfiguration extends ClasspathAttributeConfiguration {
-
-	private static ImageDescriptor descriptor = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canEdit(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public boolean canEdit(ClasspathAttributeAccess attribute) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public boolean canRemove(ClasspathAttributeAccess attribute) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getImageDescriptor(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public ImageDescriptor getImageDescriptor(ClasspathAttributeAccess attribute) {
-		if (descriptor == null) {
-			final URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage("CPDep"); //$NON-NLS-1$
-			if (gifImageURL != null) {
-				descriptor = ImageDescriptor.createFromURL(gifImageURL);
-			}
-		}
-		return descriptor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getNameLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public String getNameLabel(ClasspathAttributeAccess attribute) {
-		return Resources.nameLabel;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getValueLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public String getValueLabel(ClasspathAttributeAccess attribute) {
-		return Resources.unspecified;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performEdit(org.eclipse.swt.widgets.Shell, org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public IClasspathAttribute performEdit(Shell shell,
-			ClasspathAttributeAccess attribute) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
-	 */
-	public IClasspathAttribute performRemove(ClasspathAttributeAccess attribute) {
-		return JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_NON_DEPENDENCY, null);
-	}
-
-	private static final class Resources extends NLS {
-        public static String nameLabel;
-        public static String unspecified;
-        static
-        {
-            initializeMessages( ClasspathNonDependencyAttributeConfiguration.class.getName(), 
-                                Resources.class );
-        }
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.properties
deleted file mode 100644
index 5234408ef..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 BEA Systems, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     rfrost@bea.com - initial API and implementation
-###############################################################################
-nameLabel = Excluded from publish/export structure
-unspecified = (None)
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java
deleted file mode 100644
index f610fcf6b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.client.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AppClientArchiveUIResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("appclientarchiveui");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle = getResourceBundle();
-		}
-
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	public static String getString(String key, Object[] args) {
-
-		try {
-			return MessageFormat.format(getString(key), args);
-		} catch (IllegalArgumentException e) {
-			return getString(key);
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java
deleted file mode 100644
index 296fd5543..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportApplicationClientAction extends BaseAction {
-	public static String LABEL = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%client.export.action.label_ui_"); //$NON-NLS-1$
-	private static final String ICON = "appclient_export_wiz"; //$NON-NLS-1$
-
-	public ExportApplicationClientAction() {
-		super();
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	protected void primRun(Shell shell) {
-		AppClientComponentExportWizard wizard = new AppClientComponentExportWizard();
-		J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-		wizard.init(plugin.getWorkbench(), selection);
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java
deleted file mode 100644
index eec615500..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportApplicationClientAction extends BaseAction {
-
-	public static String LABEL = AppClientArchiveUIResourceHandler.getString("Application_Client_Import_UI_"); //$NON-NLS-1$
-	private static final String ICON = "appclient_import_wiz"; //$NON-NLS-1$
-
-	public ImportApplicationClientAction() {
-		super();
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	protected void primRun(Shell shell) {
-
-		AppClientComponentImportWizard wizard = new AppClientComponentImportWizard();
-
-		J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
-		wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java
deleted file mode 100644
index 42564f6ca..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.command;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.edit.command.AbstractOverrideableCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-/**
- * Insert the type's description here. Creation date: (06/07/01 10:56:08 AM)
- * 
- * @author: Administrator
- */
-public abstract class AbstractOverrideCommand extends AbstractCommand {
-	private AbstractOverrideableCommand overridable;
-	private J2EEClipboard j2eeClipboard;
-
-	/**
-	 * AbstractOverrideCommand constructor comment.
-	 */
-	protected AbstractOverrideCommand() {
-		super();
-	}
-
-	public AbstractOverrideCommand(AbstractOverrideableCommand command) {
-		super(command.getLabel(), command.getDescription());
-		setOverridable(command);
-	}
-
-	public boolean canExecute() {
-		return super.canExecute() && overridable.doCanExecute();
-	}
-
-	public boolean canUndo() {
-		return overridable.doCanUndo();
-	}
-
-	public Collection getAffectedObjects() {
-		return overridable.doGetAffectedObjects();
-	}
-
-	public EditingDomain getDomain() {
-		return getOverridable().getDomain();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 11:19:27 AM)
-	 * 
-	 * @return org.eclipse.jst.j2ee.internal.internal.internal.command.J2EEClipboard
-	 */
-	public J2EEClipboard getJ2eeClipboard() {
-		return j2eeClipboard;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 10:58:33 AM)
-	 * 
-	 * @return AbstractOverrideableCommand
-	 */
-	public AbstractOverrideableCommand getOverridable() {
-		return overridable;
-	}
-
-	public Collection getResult() {
-		return getJ2eeClipboard();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 11:19:27 AM)
-	 * 
-	 * @param newJ2eeClipboard
-	 *            org.eclipse.jst.j2ee.internal.internal.internal.command.J2EEClipboard
-	 */
-	protected void setJ2eeClipboard(J2EEClipboard newJ2eeClipboard) {
-		j2eeClipboard = newJ2eeClipboard;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 10:58:33 AM)
-	 * 
-	 * @param AbstractOverrideableCommand
-	 */
-	protected void setOverridable(AbstractOverrideableCommand newOverridable) {
-		overridable = newOverridable;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java
deleted file mode 100644
index 4e4ab253f..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-
-public class J2EEClipboard extends ArrayList {
-	/**
-	 * Warning cleanup 12/07/2005
-	 */
-	private static final long serialVersionUID = 8713021573099134096L;
-	private Map bindings;
-	private Map extensions;
-
-	/**
-	 * J2EEClipboard constructor comment.
-	 */
-	public J2EEClipboard(Collection defaultClipboard) {
-		super(defaultClipboard);
-	}
-
-	public boolean addAll(Collection c) {
-		boolean result = super.addAll(c);
-		if (result && (c instanceof J2EEClipboard))
-			addAllExtra((J2EEClipboard) c);
-		return result;
-	}
-
-	protected void addAllExtra(J2EEClipboard c) {
-		getBindings().putAll(c.getBindings());
-		getExtensions().putAll(c.getExtensions());
-	}
-
-	protected void addBinding(EObject boundObject, EObject binding) {
-		getBindings().put(boundObject, binding);
-	}
-
-	protected void addExtension(EObject extendedObject, EObject extension) {
-		getExtensions().put(extendedObject, extension);
-	}
-
-	public EObject getBinding(EObject o) {
-		return (EObject) getBindings().get(o);
-	}
-
-	protected Map getBindings() {
-		if (bindings == null)
-			bindings = new HashMap(10);
-		return bindings;
-	}
-
-	public EObject getExtension(EObject o) {
-		return (EObject) getExtensions().get(o);
-	}
-
-	protected Map getExtensions() {
-		if (extensions == null)
-			extensions = new HashMap(10);
-		return extensions;
-	}
-
-	public boolean hasBindings() {
-		return bindings != null && !bindings.isEmpty();
-	}
-
-	public boolean hasExtensions() {
-		return extensions != null && !extensions.isEmpty();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java
deleted file mode 100644
index bf103abeb..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-
-/**
- * Insert the type's description here. Creation date: (06/13/01 10:27:16 AM)
- * 
- * @author: Administrator
- */
-public class J2EECompoundCommand extends CompoundCommand {
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 */
-	public J2EECompoundCommand() {
-		super();
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param resultIndex
-	 *            int
-	 */
-	public J2EECompoundCommand(int resultIndex) {
-		super(resultIndex);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param resultIndex
-	 *            int
-	 * @param label
-	 *            java.lang.String
-	 */
-	public J2EECompoundCommand(int resultIndex, String label) {
-		super(resultIndex, label);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param resultIndex
-	 *            int
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 */
-	public J2EECompoundCommand(int resultIndex, String label, String description) {
-		super(resultIndex, label, description);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param resultIndex
-	 *            int
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EECompoundCommand(int resultIndex, String label, String description, java.util.List commandList) {
-		super(resultIndex, label, description, commandList);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param resultIndex
-	 *            int
-	 * @param label
-	 *            java.lang.String
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EECompoundCommand(int resultIndex, String label, java.util.List commandList) {
-		super(resultIndex, label, commandList);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param resultIndex
-	 *            int
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EECompoundCommand(int resultIndex, java.util.List commandList) {
-		super(resultIndex, commandList);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 */
-	public J2EECompoundCommand(String label) {
-		super(label);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 */
-	public J2EECompoundCommand(String label, String description) {
-		super(label, description);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EECompoundCommand(String label, String description, java.util.List commandList) {
-		super(label, description, commandList);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EECompoundCommand(String label, java.util.List commandList) {
-		super(label, commandList);
-	}
-
-	/**
-	 * J2EECompoundCommand constructor comment.
-	 * 
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EECompoundCommand(java.util.List commandList) {
-		super(commandList);
-	}
-
-	protected Collection getMergedAffectedObjectsCollection() {
-		J2EEClipboard result = new J2EEClipboard(new ArrayList());
-
-		for (Iterator commands = commandList.iterator(); commands.hasNext();) {
-			Command command = (Command) commands.next();
-			result.addAll(command.getAffectedObjects());
-		}
-
-		return result;
-	}
-
-	protected Collection getMergedResultCollection() {
-		J2EEClipboard result = new J2EEClipboard(new ArrayList());
-
-		for (Iterator commands = commandList.iterator(); commands.hasNext();) {
-			Command command = (Command) commands.next();
-			result.addAll(command.getResult());
-		}
-
-		return result;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java
deleted file mode 100644
index 51dc0bdc3..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-public class J2EECopyCommand extends AbstractCommand {
-	protected EObject objectToCopy;
-	protected EObject bindingToCopy;
-	protected EObject extensionToCopy;
-	protected J2EEClipboard result;
-	protected EtoolsCopyUtility copyUtil;
-
-	public J2EECopyCommand(EObject object, EObject binding, EObject extension, EtoolsCopyUtility copyUtility) {
-		objectToCopy = object;
-		bindingToCopy = binding;
-		extensionToCopy = extension;
-		copyUtil = copyUtility;
-	}
-
-	/**
-	 * This will perform the command activity required for the effect. The effect of calling execute
-	 * when canExecute returns false, or when canExecute hasn't been called, is undefined.
-	 */
-	public void execute() {
-		CopyGroup group = new CopyGroup();
-
-		group.add(objectToCopy);
-
-		if (bindingToCopy != null)
-			group.add(bindingToCopy);
-		if (extensionToCopy != null)
-			group.add(extensionToCopy);
-		copyUtil.copy(group);
-		EObject copy = copyUtil.getCopy(objectToCopy);
-		result = new J2EEClipboard(Collections.singleton(copy));
-
-		if (bindingToCopy != null)
-			result.addBinding(copy, copyUtil.getCopy(bindingToCopy));
-		if (extensionToCopy != null)
-			result.addExtension(copy, copyUtil.getCopy(extensionToCopy));
-	}
-
-	public Collection getAffectedObjects() {
-		return result;
-	}
-
-	public Collection getResult() {
-		return result;
-	}
-
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * This will again perform the command activity required to redo the effect after undoing the
-	 * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
-	 * you implement redo to call execute then any derived class will be restricted to by that
-	 * decision also.
-	 */
-	public void redo() {
-		//redo
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java
deleted file mode 100644
index 5581decf7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-/**
- * Insert the type's description here. Creation date: (06/11/01 8:45:21 AM)
- * 
- * @author: Administrator
- */
-public class J2EECopyFromClipboardCommand extends AbstractCommand {
-	private J2EEUIEditingDomain domain;
-	private J2EEClipboard result;
-	private EtoolsCopyUtility copyUtil;
-
-	public J2EECopyFromClipboardCommand(J2EEUIEditingDomain editingDomain) {
-		domain = editingDomain;
-
-	}
-
-	/**
-	 * This will perform the command activity required for the effect. The effect of calling execute
-	 * when canExecute returns false, or when canExecute hasn't been called, is undefined.
-	 */
-	public void execute() {
-		if (copyUtil != null)
-			return;
-		copyUtil = new EtoolsCopyUtility();
-		J2EEClipboard clipboard = domain.getJ2EEClipboard();
-		result = new J2EEClipboard(new ArrayList(0));
-		for (int i = 0; i < clipboard.size(); i++) {
-			CopyGroup group = new CopyGroup();
-			EObject o = (EObject) clipboard.get(i);
-			group.add(o);
-			EObject bnd = clipboard.getBinding(o);
-			if (bnd != null)
-				group.add(bnd);
-			EObject ext = clipboard.getExtension(o);
-			if (ext != null)
-				group.add(ext);
-			copyUtil.copy(group);
-			EObject copy = copyUtil.getCopy(o);
-			result.add(copy);
-			if (bnd != null)
-				result.addBinding(copy, copyUtil.getCopy(bnd));
-			if (ext != null)
-				result.addExtension(copy, copyUtil.getCopy(ext));
-		}
-		//Reset the util so redo will actuall redo
-		copyUtil = null;
-	}
-
-	public Collection getAffectedObjects() {
-		return result;
-	}
-
-	public Collection getResult() {
-		return result;
-	}
-
-	protected boolean prepare() {
-		return true;
-	}
-
-	/**
-	 * This will again perform the command activity required to redo the effect after undoing the
-	 * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
-	 * you implement redo to call execute then any derived class will be restricted to by that
-	 * decision also.
-	 */
-	public void redo() {
-		execute();
-	}
-
-	public void undo() {
-		result = null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java
deleted file mode 100644
index eb42b83f8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-public class J2EECopyToClipboardOverrideCommand extends CopyToClipboardCommand {
-	//The collection of source objects, with bindings and extensions, if any exist
-	protected J2EEClipboard extendedSourceObjects;
-	protected boolean onlyRefObjects = true;
-
-	public J2EECopyToClipboardOverrideCommand(CopyToClipboardCommand cmd) {
-		super(cmd.getDomain(), cmd.getSourceObjects());
-	}
-
-	protected Command createCopyCommand() {
-		CompoundCommand cmd = new J2EECompoundCommand(CompoundCommand.MERGE_COMMAND_ALL);
-		Iterator it = extendedSourceObjects.iterator();
-		EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (!(o instanceof EObject)) {
-				cmd.append(UnexecutableCommand.INSTANCE);
-			} else {
-				EObject r = (EObject) o;
-				cmd.append(new J2EECopyCommand(r, extendedSourceObjects.getBinding(r), extendedSourceObjects.getExtension(r), copyUtil));
-			}
-		}
-		return cmd.unwrap();
-	}
-
-	protected boolean prepare() {
-		prepareSourceObjects();
-		if (!onlyRefObjects) {
-			copyCommand = UnexecutableCommand.INSTANCE;
-			return copyCommand.canExecute();
-		}
-
-		if (!extendedSourceObjects.hasBindings() && !extendedSourceObjects.hasExtensions())
-			return super.prepare();
-
-		copyCommand = createCopyCommand();
-		return copyCommand.canExecute();
-	}
-
-	protected void prepareSourceObjects() {
-		extendedSourceObjects = new J2EEClipboard(getSourceObjects());
-		Iterator it = getSourceObjects().iterator();
-		while (it.hasNext()) {
-			Object o = it.next();
-			if (o instanceof EObject) {
-				//			EObject r = (EObject) o;
-				// TODO switch to adaptable commands
-				//			EObject bnd = BindingAndExtensionHelper.getBinding(r);
-				//			EObject ext = BindingAndExtensionHelper.getExtension(r);
-				//			if (bnd != null)
-				//				extendedSourceObjects.addBinding(r, bnd);
-				//			if (ext != null)
-				//				extendedSourceObjects.addExtension(r, ext);
-			} else {
-				//Right now we can only handle ref objects in the tree
-				onlyRefObjects = false;
-				return;
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java
deleted file mode 100644
index d51a6d5d0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.common.command.StrictCompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.jst.j2ee.common.internal.util.IDUtility;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain;
-
-
-public class J2EEPasteFromClipboardOverrideCommand extends PasteFromClipboardCommand {
-	private J2EECopyFromClipboardCommand copyCommand;
-	private Command addBindingsCommand;
-	private Command addExtensionsCommand;
-
-	public J2EEPasteFromClipboardOverrideCommand(PasteFromClipboardCommand p) {
-		super(p.getDomain(), p.getOwner(), p.getFeature(), p.getIndex(), false);
-	}
-
-	public void doExecute() {
-		super.doExecute();
-		executeAddBindings();
-		executeAddExtensions();
-		J2EEClipboard result = (J2EEClipboard) doGetResult();
-		for (int i = 0; i < result.size(); i++) {
-			EObject o = (EObject) result.get(i);
-			if (result.getBinding(o) != null || result.getExtension(o) != null)
-				IDUtility.setDefaultID(o, true);
-		}
-	}
-
-	public Collection doGetAffectedObjects() {
-		return copyCommand.getAffectedObjects();
-	}
-
-	public Collection doGetResult() {
-		return copyCommand.getResult();
-	}
-
-	public void doRedo() {
-		super.doRedo();
-		if (addBindingsCommand != null)
-			addBindingsCommand.redo();
-		if (addExtensionsCommand != null)
-			addExtensionsCommand.redo();
-	}
-
-	public void doUndo() {
-		super.doUndo();
-		if (addBindingsCommand != null)
-			addBindingsCommand.undo();
-		if (addExtensionsCommand != null)
-			addExtensionsCommand.undo();
-	}
-
-	protected void executeAddBindings() {
-		if (addBindingsCommand != null && addBindingsCommand.canExecute())
-			addBindingsCommand.execute();
-	}
-
-	protected void executeAddExtensions() {
-		if (addExtensionsCommand != null && addExtensionsCommand.canExecute())
-			addExtensionsCommand.execute();
-	}
-
-	public J2EEClipboard getCopiedClipoard() {
-		return (J2EEClipboard) copyCommand.getResult();
-	}
-
-	protected J2EEClipboard getJ2EEClipboard() {
-		return (J2EEClipboard) domain.getClipboard();
-	}
-
-	protected boolean prepare() {
-		if (getJ2EEClipboard() == null)
-			return false;
-		command = new StrictCompoundCommand();
-
-		copyCommand = new J2EECopyFromClipboardCommand((J2EEUIEditingDomain) domain);
-		command.append(copyCommand);
-
-		command.append(new CommandWrapper() {
-			protected Command createCommand() {
-				Command addCommand = AddCommand.create(getDomain(), getOwner(), getFeature(), copyCommand.getResult(), getIndex());
-				return addCommand;
-			}
-		});
-		prepareBindingCommand(copyCommand);
-		prepareExtensionCommand(copyCommand);
-
-		boolean result;
-		if (optimize) {
-			// This will determine canExecute as efficiently as possible.
-			//
-			result = optimizedCanExecute();
-		} else {
-			// This will actually execute the copy command in order to check if the add can execute.
-			//
-			result = command.canExecute();
-		}
-
-		return result;
-	}
-
-	protected void prepareBindingCommand(final J2EECopyFromClipboardCommand cmd) {
-		if (!getJ2EEClipboard().hasBindings())
-			return;
-		//TODO make adaptable command
-		//	addBindingsCommand = new CommandWrapper() {
-		//		protected Command createCommand() {
-		//			Object bindingOwner = BindingAndExtensionHelper.getBindingAddOwner((EObject)getOwner());
-		//			Collection bindingsCopies = getCopiedClipoard().getBindings().values();
-		//			Command addCommand = AddCommand.create(getDomain(), bindingOwner, null, bindingsCopies,
-		// CommandParameter.NO_INDEX);
-		//			return addCommand;
-		//		}
-		//	};
-	}
-
-	protected void prepareExtensionCommand(final J2EECopyFromClipboardCommand cmd) {
-		if (!getJ2EEClipboard().hasExtensions())
-			return;
-		// TODO make adaptable command
-		//	addExtensionsCommand = new CommandWrapper() {
-		//		protected Command createCommand() {
-		//			Object extensionOwner =
-		// BindingAndExtensionHelper.getExtensionAddOwner((EObject)getOwner());
-		//			Collection extensionsCopies = getCopiedClipoard().getExtensions().values();
-		//			Command addCommand = AddCommand.create(getDomain(), extensionOwner, null,
-		// extensionsCopies, CommandParameter.NO_INDEX);
-		//			return addCommand;
-		//		}
-		//	};
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java
deleted file mode 100644
index ab6103904..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.command.RemoveCommand;
-
-/**
- * Insert the type's description here. Creation date: (06/07/01 10:44:02 AM)
- * 
- * @author: Administrator
- */
-public class J2EERemoveOverrideCommand extends AbstractOverrideCommand {
-	private RemoveCommand bindingsRemoveCommand;
-	private RemoveCommand extensionsRemoveCommand;
-	private ResourceSet resourceSet;
-
-	/**
-	 * J2EERemoveOverrideCommand constructor comment.
-	 */
-	protected J2EERemoveOverrideCommand() {
-		super();
-	}
-
-	public J2EERemoveOverrideCommand(RemoveCommand command) {
-		super(command);
-	}
-
-	protected RemoveCommand createRemoveCommand(Collection elements) {
-		return (RemoveCommand) RemoveCommand.create(getDomain(), elements);
-	}
-
-	/**
-	 * This will perform the command activity required for the effect. The effect of calling execute
-	 * when canExecute returns false, or when canExecute hasn't been called, is undefined.
-	 */
-	public void execute() {
-		/*
-		 * For each object being removed, check if it has a binding, and an extension Make
-		 * collections of these, make a command parameter for each collection, an instantiate a
-		 * remove command
-		 */
-
-		Collection objects = getRemoveCommand().getCollection();
-		List bindings = new ArrayList(objects.size());
-		List extensions = new ArrayList(objects.size());
-		Iterator it = objects.iterator();
-		while (it.hasNext()) {
-			EObject o = (EObject) it.next();
-			if (resourceSet == null)
-				resourceSet = o.eResource().getResourceSet();
-			// TODO make command adaptable
-			//		EObject binding = BindingAndExtensionHelper.getBinding(o);
-			//		if (binding != null) {
-			//			bindings.add(binding);
-			//			getJ2eeClipboard().addBinding(o, binding);
-			//		}
-			//		EObject extension = BindingAndExtensionHelper.getExtension(o);
-			//		if (extension != null) {
-			//			extensions.add(extension);
-			//			getJ2eeClipboard().addExtension(o, extension);
-			//		}
-		}
-		if (!bindings.isEmpty())
-			setBindingsRemoveCommand(createRemoveCommand(bindings));
-
-		if (!extensions.isEmpty())
-			setExtensionsRemoveCommand(createRemoveCommand(extensions));
-
-		executeAllChildren();
-	}
-
-	protected void executeAllChildren() {
-		executeNested(bindingsRemoveCommand);
-		executeNested(extensionsRemoveCommand);
-		getOverridable().doExecute();
-	}
-
-	protected void executeNested(RemoveCommand cmd) {
-		if (cmd != null && cmd.doCanExecute()) {
-			cmd.doExecute();
-			//		Collection result = cmd.getResult();
-			//TODO
-			//		BindingAndExtensionHelper.resolveAllProxies(result, resourceSet);
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
-	 * 
-	 * @return RemoveCommand
-	 */
-	protected RemoveCommand getBindingsRemoveCommand() {
-		return bindingsRemoveCommand;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
-	 * 
-	 * @return RemoveCommand
-	 */
-	protected RemoveCommand getExtensionsRemoveCommand() {
-		return extensionsRemoveCommand;
-	}
-
-	public RemoveCommand getRemoveCommand() {
-		return (RemoveCommand) getOverridable();
-	}
-
-	protected boolean prepare() {
-		setJ2eeClipboard(new J2EEClipboard(getRemoveCommand().getCollection()));
-		return true;
-	}
-
-	/**
-	 * This will again perform the command activity required to redo the effect after undoing the
-	 * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
-	 * you implement redo to call execute then any derived class will be restricted to by that
-	 * decision also.
-	 */
-	public void redo() {
-		executeAllChildren();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
-	 * 
-	 * @param newBindingsRemoveCommand
-	 *            RemoveCommand
-	 */
-	protected void setBindingsRemoveCommand(RemoveCommand newBindingsRemoveCommand) {
-		bindingsRemoveCommand = newBindingsRemoveCommand;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
-	 * 
-	 * @param newExtensionsRemoveCommand
-	 *            RemoveCommand
-	 */
-	protected void setExtensionsRemoveCommand(RemoveCommand newExtensionsRemoveCommand) {
-		extensionsRemoveCommand = newExtensionsRemoveCommand;
-	}
-
-	public void undo() {
-		getRemoveCommand().doUndo();
-		undoNested(bindingsRemoveCommand);
-		undoNested(extensionsRemoveCommand);
-	}
-
-	protected void undoNested(RemoveCommand cmd) {
-		if (cmd != null && cmd.doCanUndo())
-			cmd.doUndo();
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java
deleted file mode 100644
index e0df82ab7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.command;
-
-import org.eclipse.emf.common.command.StrictCompoundCommand;
-
-
-
-/**
- * Overridden to provide an accessor to the pessimistic field. This is needed for the case of
- * undo/redo paste. We need the nested copy commmand in the paste command to redo itself when the
- * paste command is copied, otherwise we run into sed exception.
- */
-public class J2EEStrictCompoundCommand extends StrictCompoundCommand {
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 */
-	public J2EEStrictCompoundCommand() {
-		super();
-	}
-
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 */
-	public J2EEStrictCompoundCommand(String label) {
-		super(label);
-	}
-
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 */
-	public J2EEStrictCompoundCommand(String label, String description) {
-		super(label, description);
-	}
-
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param description
-	 *            java.lang.String
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EEStrictCompoundCommand(String label, String description, java.util.List commandList) {
-		super(label, description, commandList);
-	}
-
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 * 
-	 * @param label
-	 *            java.lang.String
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EEStrictCompoundCommand(String label, java.util.List commandList) {
-		super(label, commandList);
-	}
-
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 * 
-	 * @param commandList
-	 *            java.util.List
-	 */
-	public J2EEStrictCompoundCommand(java.util.List commandList) {
-		super(commandList);
-	}
-
-	/**
-	 * J2EEStrictCompoundCommand constructor comment.
-	 */
-	public J2EEStrictCompoundCommand(boolean pessimistic) {
-		super();
-		setIsPessismistic(pessimistic);
-	}
-
-	public void setIsPessismistic(boolean aBool) {
-		isPessimistic = aBool;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
deleted file mode 100644
index ea7adc712..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 18, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EnterpriseDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory  {
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		return null;
-	}
-
-	public Class[] getAdapterList() {
-		return new Class[] {ILaunchable.class };
-	}
-
-	public IModuleArtifact getModuleArtifact(Object obj) {
-		return EnterpriseApplicationDeployableAdapterUtil.getModuleObject(obj);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java
deleted file mode 100644
index b3cb39e4e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-/**
- * @author blancett
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EnterpriseModuleArtifact implements IModuleArtifact {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.server.core.IModuleArtifact#getModule()
-	 */
-	public IModule getModule() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public Class[] getAdapterList() {
-		return new Class[] { IModuleArtifact.class, ILaunchable.class };
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java
deleted file mode 100644
index 212774545..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-
-public class J2EEDeployableAdapterFactory implements IAdapterFactory {
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		IModuleArtifact moduleArtifact = null;
-/*		if (adapterType == IModuleArtifact.class ) {
-			
-			if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.web.deployables.WebModuleArtifact")) {
-				moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.web.deployables.WebModuleArtifact");
-			}
-			if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.ejb.internal.deployables.IEJBModuleArtifact")) {
-				moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.ejb.internal.deployables.IEJBModuleArtifact");
-			}
-			if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.deployables.EnterpriseModuleArtifact")) {
-				moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.deployables.EnterpriseModuleArtifact");
-			}
-			if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact")) {
-				moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact");
-			}
-		}*/
-		return moduleArtifact;
-	}
-
-	public Class[] getAdapterList() {
-		return new Class[]{IModuleArtifact.class, ILaunchable.class};
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ChangeLibDirDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ChangeLibDirDialog.java
deleted file mode 100644
index f550e44e2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ChangeLibDirDialog.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-
-public class ChangeLibDirDialog extends InputDialog {
-	private boolean warnBlank;
-	
-    public ChangeLibDirDialog(Shell parentShell, String initialValue, boolean warnBlank) { 
-    	super(parentShell, J2EEUIMessages.getResourceString(J2EEUIMessages.CHANGE_LIB_DIR_HEAD),
-    			J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_LIB_DIR_PROPMPT), initialValue, null);
-    	this.warnBlank = warnBlank;
-    }
-    
-    protected void buttonPressed(int buttonId) {
-        if (buttonId == IDialogConstants.OK_ID) {
-        	String res = getText().getText().trim(); 
-        	if (res.length() == 0) {
-    			if (warnBlank)
-    				if (!MessageDialog.openQuestion(this.getShell(), 
-    					J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR), 
-    					J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR_CONFIRM))) return;
-        	} else {
-    			if (res.startsWith("" + IPath.SEPARATOR)); //$NON-NLS-1$
-    			res = res.substring(1);	
-    			Path p = new Path(""); //$NON-NLS-1$
-    			boolean valid = p.isValidSegment(res); 
-    			if (!valid) {
-    				MessageDialog.openError(null, 
-    						J2EEUIMessages.getResourceString(J2EEUIMessages.INVALID_PATH), 
-    						J2EEUIMessages.getResourceString(J2EEUIMessages.INVALID_PATH_MSG));	
-    				return;
-    			}	        		
-        	}
-        } 
-        super.buttonPressed(buttonId);
-    }    
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARComposite.java
deleted file mode 100644
index fa025152a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARComposite.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-public class DeleteEARComposite extends Composite implements J2EEDeleteUIConstants, Listener, ICheckStateListener {
-
-	protected DeleteEARDialog dialog;
-	protected Button deleteAppProjectsBtn;
-	protected Button deleteRefProjectsBtn;
-	protected Composite radioComposite;
-	protected Button detailsBtn;
-	protected DeleteModuleReferencesComposite moduleRefsComposite;
-	protected CheckboxTableViewer projectsList;
-	protected boolean listCreated = false;
-	protected Map referencedProjects;
-	protected WorkbenchLabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
-
-	/**
-	 * Constructor for DeleteEARComposite.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public DeleteEARComposite(Composite parent, DeleteEARDialog dialog, int style, Set referencedProjects) {
-		super(parent, style);
-		this.dialog = dialog;
-		initReferencedProjects(referencedProjects);
-		addChildren();
-	}
-
-	/**
-	 * Answer the referenced projects which the user has chosen to also delete
-	 */
-	public java.util.List getSelectedReferencedProjects() {
-		if (deleteAppProjectsBtn.getSelection())
-			return Collections.EMPTY_LIST;
-		java.util.List result = new ArrayList();
-		for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry element = (Map.Entry) iter.next();
-			boolean isSelected = ((Boolean) element.getValue()).booleanValue();
-			if (isSelected)
-				result.add(element.getKey());
-		}
-		return result;
-	}
-
-	/**
-	 * @see J2EEDeleteDialog#createDeleteOptions()
-	 */
-	public DeleteOptions createDeleteOptions() {
-		DeleteOptions opts = new DeleteOptions();
-		opts.setIsEARDelete(true);
-		opts.setDeleteProjects(true);
-		opts.setDeleteModuleDependencies(moduleRefsComposite.shouldDeleteModuleDependencies());
-		opts.setDeleteModules(moduleRefsComposite.shouldDeleteModules());
-		opts.setSelectedReferencedProjects(getSelectedReferencedProjects());
-		return opts;
-	}
-
-
-
-	protected void initReferencedProjects(Set projects) {
-		referencedProjects = new HashMap();
-		for (Iterator iter = projects.iterator(); iter.hasNext();) {
-			IProject project = (IProject) iter.next();
-			referencedProjects.put(project, Boolean.TRUE);
-		}
-	}
-
-	protected void addChildren() {
-		setLayout();
-		addRadioComposite();
-		moduleRefsComposite = new DeleteModuleReferencesComposite(this, SWT.NONE, true);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		data.horizontalIndent = 10;
-		moduleRefsComposite.setLayoutData(data);
-		//setup defaults
-		deleteAppProjectsBtn.setSelection(true);
-		deleteAppProjectsBtnSelected();
-	}
-
-	protected void setLayout() {
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 1;
-		setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		setLayoutData(data);
-	}
-
-	protected void addRadioComposite() {
-		radioComposite = new Composite(this, SWT.NONE);
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 2;
-		radioComposite.setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		radioComposite.setLayoutData(data);
-		deleteAppProjectsBtn = new Button(radioComposite, SWT.RADIO);
-		deleteAppProjectsBtn.setText(DELETE_EAR_PROJECTS);
-		deleteAppProjectsBtn.addListener(SWT.Selection, this);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		deleteAppProjectsBtn.setLayoutData(data);
-
-		deleteRefProjectsBtn = new Button(radioComposite, SWT.RADIO);
-		deleteRefProjectsBtn.setText(DELETE_REFERENCED_PROJECTS);
-		deleteRefProjectsBtn.addListener(SWT.Selection, this);
-		deleteRefProjectsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		detailsBtn = new Button(radioComposite, SWT.PUSH);
-		detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		detailsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		detailsBtn.addListener(SWT.Selection, this);
-		detailsBtn.setEnabled(false);
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == deleteAppProjectsBtn)
-			deleteAppProjectsBtnSelected();
-		else if (event.widget == deleteRefProjectsBtn)
-			deleteRefProjectsBtnSelected();
-		else if (event.widget == detailsBtn)
-			detailsBtnSelected();
-	}
-
-	protected void deleteAppProjectsBtnSelected() {
-		if (deleteAppProjectsBtn.getSelection()) {
-			if (listCreated)
-				toggleDetailsArea();
-			detailsBtn.setEnabled(false);
-			moduleRefsComposite.setButtonsEnabled(false);
-		}
-	}
-
-	protected void deleteRefProjectsBtnSelected() {
-		if (deleteRefProjectsBtn.getSelection()) {
-			detailsBtn.setEnabled(true);
-			moduleRefsComposite.setButtonsEnabled(true);
-		}
-	}
-
-	/**
-	 * Toggles the unfolding of the details area. This is triggered by the user pressing the details
-	 * button.
-	 */
-	protected void toggleDetailsArea() {
-		Point windowSize = getShell().getSize();
-		Point oldSize = dialog.getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		if (listCreated) {
-			projectsList.getControl().dispose();
-			listCreated = false;
-			detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		} else {
-			createDropDownList();
-			detailsBtn.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-		}
-
-		Point newSize = dialog.getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
-	}
-
-	protected void createDropDownList() {
-		// create the list
-		projectsList = CheckboxTableViewer.newCheckList(radioComposite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		projectsList.setLabelProvider(createLabelProvider());
-		projectsList.setSorter(new ViewerSorter() {/*viewersorter*/});
-		projectsList.addCheckStateListener(this);
-		// fill the list
-		populateList();
-
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-		data.heightHint = projectsList.getTable().getItemHeight() * referencedProjects.size();
-		data.horizontalSpan = 2;
-		data.horizontalIndent = 10;
-		projectsList.getTable().setLayoutData(data);
-
-		listCreated = true;
-	}
-
-	protected void populateList() {
-		for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			projectsList.add(entry.getKey());
-			boolean checked = ((Boolean) entry.getValue()).booleanValue();
-			projectsList.setChecked(entry.getKey(), checked);
-		}
-	}
-
-	protected void detailsBtnSelected() {
-		toggleDetailsArea();
-	}
-
-	/**
-	 * @see ICheckStateListener#checkStateChanged(CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		referencedProjects.put(event.getElement(), new Boolean(event.getChecked()));
-	}
-
-	protected ITableLabelProvider createLabelProvider() {
-		return new ITableLabelProvider() {
-			public void dispose() {
-				//dispose
-			}
-
-			public Image getColumnImage(Object element, int columnIndex) {
-				return workbenchLabelProvider.getImage(element);
-			}
-
-			/**
-			 * @see ITableLabelProvider#getColumnText(Object, int)
-			 */
-			public String getColumnText(Object element, int columnIndex) {
-				return workbenchLabelProvider.getText(element);
-			}
-
-			public void addListener(ILabelProviderListener listener) {
-				//do nothing
-			}
-
-			public boolean isLabelProperty(Object element, String property) {
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener) {
-				//do nothing
-			}
-		};
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java
deleted file mode 100644
index 48f41f5e1..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteEARDialog.java
+++ /dev/null
@@ -1,66 +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.j2ee.internal.dialogs;
-
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class DeleteEARDialog extends J2EEDeleteDialog {
-	protected DeleteEARComposite deleteComposite;
-	protected Set referencedProjects;
-
-	/**
-	 * Constructor for DeleteEARDialog.
-	 * 
-	 * @param parentShell
-	 * @param dialogTitle
-	 */
-	public DeleteEARDialog(Shell parentShell, Set referencedProjects) {
-		super(parentShell, DELETE_EAR_OPTIONS);
-		this.referencedProjects = referencedProjects;
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.dialogs.MessageDialog#createCustomArea(Composite)
-	 */
-	protected Control createCustomArea(Composite parent) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.DELEATE_EAR_DIALOG_1); //$NON-NLS-1$
-		deleteComposite = new DeleteEARComposite(parent, this, SWT.NONE, referencedProjects);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalIndent = 10;
-		deleteComposite.setLayoutData(data);
-		return deleteComposite;
-	}
-
-	/**
-	 * @see J2EEDeleteDialog#createDeleteOptions()
-	 */
-	public void createDeleteOptions() {
-		deleteOptions = deleteComposite.createDeleteOptions();
-	}
-
-	/**
-	 * @see org.eclipse.jface.window.Window#getContents()
-	 */
-	public Control getContents() {
-		return super.getContents();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleComposite.java
deleted file mode 100644
index ceda40a34..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleComposite.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-
-public class DeleteModuleComposite extends Composite implements J2EEDeleteUIConstants, Listener {
-
-	//	protected Button deleteProjectsCheckBox;
-	protected Button deleteAppProjectsBtn;
-	protected Button deleteRefProjectsBtn;
-	protected Composite radioComposite;
-	protected DeleteModuleReferencesComposite moduleRefsComposite;
-
-
-	/**
-	 * Constructor for DeleteModuleComposite.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public DeleteModuleComposite(Composite parent, int style) {
-		super(parent, style);
-		addChildren();
-
-	}
-
-	protected void addChildren() {
-		addDeleteProjectsGroup();
-		addDeleteModuleRefsComposite();
-		//set default values
-		deleteAppProjectsBtn.setSelection(true);
-		deleteAppProjectsBtnSelected();
-	}
-
-	protected void addDeleteProjectsGroup() {
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 1;
-		setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		setLayoutData(data);
-
-		radioComposite = new Composite(this, SWT.NONE);
-		lay = new GridLayout();
-		lay.numColumns = 2;
-		radioComposite.setLayout(lay);
-		data = new GridData(GridData.FILL_BOTH);
-		radioComposite.setLayoutData(data);
-		deleteAppProjectsBtn = new Button(radioComposite, SWT.RADIO);
-		deleteAppProjectsBtn.setText(DELETE_PROJECTS_ONLY);
-		deleteAppProjectsBtn.addListener(SWT.Selection, this);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		deleteAppProjectsBtn.setLayoutData(data);
-
-		deleteRefProjectsBtn = new Button(radioComposite, SWT.RADIO);
-		deleteRefProjectsBtn.setText(DELETE_PROJECT_REFERENCES);
-		deleteRefProjectsBtn.addListener(SWT.Selection, this);
-		deleteRefProjectsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	}
-
-	protected void addDeleteModuleRefsComposite() {
-		moduleRefsComposite = new DeleteModuleReferencesComposite(this, SWT.NONE, false);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		data.horizontalIndent = 10;
-		moduleRefsComposite.setLayoutData(data);
-	}
-
-
-	protected void addSeparator() {
-		Label sep = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		sep.setLayoutData(data);
-	}
-
-	public boolean shouldDeleteProjects() {
-		//		return deleteProjectsCheckBox.getSelection();
-		// the project should be deleted, since delete was the selected action
-		return true;
-	}
-
-
-	public boolean shouldDeleteModuleDependencies() {
-		return moduleRefsComposite.shouldDeleteModuleDependencies();
-	}
-
-	public boolean shouldDeleteModules() {
-		return moduleRefsComposite.shouldDeleteModules();
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == deleteAppProjectsBtn)
-			deleteAppProjectsBtnSelected();
-		else if (event.widget == deleteRefProjectsBtn)
-			deleteRefProjectsBtnSelected();
-	}
-
-	protected void deleteAppProjectsBtnSelected() {
-		if (deleteAppProjectsBtn.getSelection()) {
-			moduleRefsComposite.setButtonsEnabled(false);
-		}
-	}
-
-	protected void deleteRefProjectsBtnSelected() {
-		if (deleteRefProjectsBtn.getSelection()) {
-			moduleRefsComposite.setButtonsEnabled(true);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleDialog.java
deleted file mode 100644
index cfb80fe79..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleDialog.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-public class DeleteModuleDialog extends J2EEDeleteDialog implements J2EEDeleteUIConstants {
-
-	protected DeleteModuleComposite deleteComposite;
-
-	public DeleteModuleDialog(Shell parentShell) {
-		super(parentShell, DELETE_MODULE_OPTIONS);
-	}
-
-	protected Control createCustomArea(Composite parent) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.DELEATE_MODULE_DIALOG_1); //$NON-NLS-1$
-		deleteComposite = new DeleteModuleComposite(parent, SWT.NONE);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalIndent = 10;
-		deleteComposite.setLayoutData(data);
-		return deleteComposite;
-	}
-
-	public void createDeleteOptions() {
-		deleteOptions = new DeleteOptions();
-		deleteOptions.setDeleteProjects(deleteComposite.shouldDeleteProjects());
-		deleteOptions.setDeleteModules(deleteComposite.shouldDeleteModules());
-		deleteOptions.setDeleteModuleDependencies(deleteComposite.shouldDeleteModuleDependencies());
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleReferencesComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleReferencesComposite.java
deleted file mode 100644
index 393189d18..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DeleteModuleReferencesComposite.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-public class DeleteModuleReferencesComposite extends Composite implements J2EEDeleteUIConstants, Listener {
-
-	protected Button deleteModulesCheckbox;
-	protected Button deleteModuleDependenciesCheckbox;
-	protected boolean isEARDelete;
-
-	/**
-	 * Constructor for DeleteModuleReferencesComposite.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public DeleteModuleReferencesComposite(Composite parent, int style, boolean isEARDelete) {
-		super(parent, style);
-		this.isEARDelete = isEARDelete;
-		addChildren();
-	}
-
-	protected void addChildren() {
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 1;
-		setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		setLayoutData(data);
-
-		addDeleteModulesCheckbox();
-		addDeleteModuleDependenciesCheckbox();
-	}
-
-	protected void addDeleteModuleDependenciesCheckbox() {
-		deleteModuleDependenciesCheckbox = new Button(this, SWT.CHECK);
-		deleteModuleDependenciesCheckbox.setText(DELETE_MODULE_DEPENDENCIES);
-
-	}
-
-	protected void addDeleteModulesCheckbox() {
-		deleteModulesCheckbox = new Button(this, SWT.CHECK);
-		String label = isEARDelete ? DELETE_MODULES_OTHER : DELETE_MODULES;
-		deleteModulesCheckbox.setText(label);
-		deleteModulesCheckbox.addListener(SWT.Selection, this);
-	}
-
-	public boolean shouldDeleteModuleDependencies() {
-		return deleteModuleDependenciesCheckbox.getSelection();
-	}
-
-	public boolean shouldDeleteModules() {
-		return deleteModulesCheckbox.getSelection();
-	}
-
-	public void setButtonsEnabled(boolean enabled) {
-		deleteModuleDependenciesCheckbox.setSelection(enabled);
-		deleteModulesCheckbox.setSelection(enabled);
-		deleteModuleDependenciesCheckbox.setEnabled(enabled);
-		deleteModulesCheckbox.setEnabled(enabled);
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == deleteModulesCheckbox && deleteModulesCheckbox.getSelection() && !deleteModuleDependenciesCheckbox.getSelection())
-			deleteModuleDependenciesCheckbox.setSelection(true);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DependencyConflictResolveDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DependencyConflictResolveDialog.java
deleted file mode 100644
index 985c2aebb..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DependencyConflictResolveDialog.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.*;
-
-public class DependencyConflictResolveDialog extends MessageDialogWithToggle {
-	
-	public static final int BTN_ID_OK = 0;
-	public static final int BTN_ID_CANCEL = 1;
-	
-	public static final int DLG_TYPE_1 = 1;
-	public static final int DLG_TYPE_2 = 2;
-	
-	public static final String DONT_SHOW_AGAIN = "DependencyConflictResolveDialog.DONT_SHOW_AGAIN";  //$NON-NLS-1$
-	
-	public DependencyConflictResolveDialog(Shell parentShell, 
-			int dlgType) {
-		
-		super(parentShell, 
-				J2EEUIMessages.getResourceString(J2EEUIMessages.DEPENDENCY_CONFLICT_TITLE), 
-				null, 
-				J2EEUIMessages.getResourceString((dlgType == DLG_TYPE_1) ? 
-						J2EEUIMessages.DEPENDENCY_CONFLICT_MSG_1 :
-						J2EEUIMessages.DEPENDENCY_CONFLICT_MSG_2)
-						
-				, MessageDialog.WARNING,
-				
-				new String[] { J2EEUIMessages.OK_BUTTON, 
-					J2EEUIMessages.CANCEL_BUTTON }, 
-				BTN_ID_CANCEL,
-				J2EEUIMessages.getResourceString(J2EEUIMessages.DO_NOT_SHOW_WARNING_AGAIN),
-				false);
-	}
-		
-	public int open() {
-		if (getPrefStore().getBoolean(DONT_SHOW_AGAIN))
-			return BTN_ID_OK;
-		setToggleState(getPrefStore().getBoolean(DONT_SHOW_AGAIN));
-		return super.open();
-	}
-	
-	public boolean close() {
-		getPrefStore().setValue(DONT_SHOW_AGAIN, getToggleState());
-		return super.close();
-	}
-	
-	public IPreferenceStore getPrefStore() {
-		return J2EEUIPlugin.getDefault().getPreferenceStore();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java
deleted file mode 100644
index 5442f2c17..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class FilteredFileSelectionDialog extends ElementTreeSelectionDialog {
-	protected String[] fExtensions;
-	/**
-	 * FilteredFileSelectionDialog constructor comment.
-	 * 
-	 * @param parent
-	 *            Shell
-	 * @parent extensions String[]
-	 */
-	public FilteredFileSelectionDialog(Shell parent, String[] extensions) {
-		this(parent, null, null, extensions, false);
-	}
-	/**
-	 * FilteredFileSelectionDialog constructor comment.
-	 * 
-	 * @param parent
-	 *            Shell
-	 * @param title
-	 *            String
-	 * @param message
-	 *            String
-	 * @parent extensions String[]
-	 * @param allowMultiple
-	 *            boolean
-	 */
-	public FilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple) {
-		super(parent, new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
-		setTitle(title);
-		if (title == null)
-			setTitle(J2EEUIMessages.getResourceString("File_Selection_UI_")); //$NON-NLS-1$
-		if (message == null)
-			message = J2EEUIMessages.getResourceString("Select_a_file__UI_"); //$NON-NLS-1$
-		setMessage(message);
-		setAllowMultiple(true);
-		setExtensions(extensions);
-		addFilter(new TypedFileViewerFilter(extensions));
-		setValidator(new TypedElementSelectionValidator(new Class[]{IFile.class}, allowMultiple));
-
-	}
-	public String[] getExtensions() {
-		return fExtensions;
-	}
-	public void setExtensions(String[] extensions) {
-		fExtensions = extensions;
-	}
-
-	public void setHelp(String helpCode) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.getParentShell(), helpCode); //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteDialog.java
deleted file mode 100644
index be97f20db..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteDialog.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.delete.DeleteOptions;
-import org.eclipse.swt.widgets.Shell;
-
-
-public abstract class J2EEDeleteDialog extends MessageDialog implements J2EEDeleteUIConstants {
-
-	protected DeleteOptions deleteOptions;
-
-	/**
-	 * Constructor for J2EEDeleteDialog.
-	 * 
-	 * @param parentShell
-	 * @param dialogTitle
-	 * @param dialogTitleImage
-	 * @param dialogMessage
-	 * @param dialogImageType
-	 * @param dialogButtonLabels
-	 * @param defaultIndex
-	 */
-	public J2EEDeleteDialog(Shell parentShell, String dialogTitle) {
-		super(parentShell, dialogTitle, null, DELETE_DIALOG_MESSAGE, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0);
-	}
-
-	public DeleteOptions getDeleteOptions() {
-		return deleteOptions;
-	}
-
-
-	public abstract void createDeleteOptions();
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == 0)
-			createDeleteOptions();
-		super.buttonPressed(buttonId);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteUIConstants.java
deleted file mode 100644
index 2ae744b61..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeleteUIConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public interface J2EEDeleteUIConstants {
-	String DELETE = J2EEUIMessages.getResourceString("Delete_1"); //$NON-NLS-1$
-	String DELETE_PROJECTS = J2EEUIMessages.getResourceString("Delete_selected_project(s)_2"); //$NON-NLS-1$
-	String DELETE_MODULES = J2EEUIMessages.getResourceString("Remove_module(s)_from_all_Enterprise_Applications_3"); //$NON-NLS-1$
-	String DELETE_MODULES_OTHER = J2EEUIMessages.getResourceString("Remove_module(s)_from_all_other_Enterprise_Applications_4"); //$NON-NLS-1$
-	String DELETE_MODULE_DEPENDENCIES = J2EEUIMessages.getResourceString("Remove_module_dependencies_referencing_selected_project(s)_5"); //$NON-NLS-1$
-	String DELETE_MODULE_OPTIONS = J2EEUIMessages.getResourceString("Delete_Module_Options_6"); //$NON-NLS-1$
-	String DELETE_EAR_OPTIONS = J2EEUIMessages.getResourceString("Delete_Enterprise_Application_Options_7"); //$NON-NLS-1$
-	String DELETE_NOT_COMPLETED = J2EEUIMessages.getResourceString("Delete_could_not_be_completed_8"); //$NON-NLS-1$
-	String DELETE_ERROR = J2EEUIMessages.getResourceString("Delete_error_9"); //$NON-NLS-1$
-	String DELETE_DIALOG_MESSAGE = J2EEUIMessages.getResourceString("What_would_you_like_to_delete__10"); //$NON-NLS-1$
-	String DELETE_EAR_PROJECTS = J2EEUIMessages.getResourceString("Delete_selected_Enterprise_Application_project(s)_only_11"); //$NON-NLS-1$
-	String DELETE_REFERENCED_PROJECTS = J2EEUIMessages.getResourceString("Also_delete_module_and_utility_Java_projects_12"); //$NON-NLS-1$
-	String DELETE_PROJECTS_ONLY = J2EEUIMessages.getResourceString("Delete_selected_project(s)_only_13"); //$NON-NLS-1$
-	String DELETE_PROJECT_REFERENCES = J2EEUIMessages.getResourceString("Also_delete_references_to_selected_project(s)_14"); //$NON-NLS-1$
-	String CUSTOM_DELETE_MIX_MATCH = J2EEUIMessages.getResourceString("CUSTOM_DELETE_MIX_MATCH_UI_"); //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java
deleted file mode 100644
index 9e29ba990..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on May 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author sagarwal
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class J2EEDeployStatusDialog extends ProgressMonitorDialog implements J2EEDeployUIConstants {
-
-	/**
-	 * Reserve room for this many list items.
-	 */
-	private static final int LIST_ITEM_COUNT = 7;
-	private int severity = IStatus.OK;
-	public Color DESC_COLOR = new Color(null, 255, 255, 255);
-	/**
-	 * The Details button.
-	 */
-	private Button detailsButton;
-
-	/**
-	 * The SWT list control that displays the error details.
-	 */
-	private Text text;
-
-	/**
-	 * Indicates whether the error details viewer is currently created.
-	 */
-	private boolean textCreated = false;
-
-	/**
-	 * List of the main error object's detailed errors (element type:
-	 * <code>J2EEMigrationStatus</code>).
-	 */
-	private java.util.List statusList;
-
-	/**
-	 * @param parent
-	 */
-	public J2EEDeployStatusDialog(Shell parent, List status) {
-		super(parent);
-		setShellStyle(SWT.BORDER | SWT.TITLE | SWT.APPLICATION_MODAL | SWT.RESIZE); // no
-		statusList = status;
-	}
-
-	/**
-	 * Called just after the operation is run. Default behaviour is to decrement the nesting depth,
-	 * and close the dialog.
-	 * 
-	 * @plannedfor 3.0
-	 */
-	protected void finishedRun() {
-		decrementNestingDepth();
-		clearCursors();
-		cancel.setEnabled(true);
-		detailsButton.setEnabled(true);
-		computeSeverity();
-		setDeploymentStatus();
-	}
-
-	/**
-	 *  
-	 */
-	private void setDeploymentStatus() {
-		setMessageOrDefault();
-		imageLabel.setImage(getImage());
-	}
-
-	protected void setMessageOrDefault() {
-		switch (getSeverity()) {
-			case IStatus.ERROR :
-				message = DEPLOY_ERRORS_REPORT;
-				break;
-			case IStatus.WARNING :
-				message = DEPLOY_WARNINGS_REPORT;
-				break;
-			default :
-				message = DEPLOY_SUCCESS_REPORT;
-				break;
-		}
-		setMessage(message);
-	}
-
-
-	protected void createCancelButton(Composite parent) {
-		super.createCancelButton(parent);
-		cancel.setText(IDialogConstants.OK_LABEL);
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// cancel button
-		createCancelButton(parent);
-		detailsButton = createButton(parent, IDialogConstants.DETAILS_ID, IDialogConstants.SHOW_DETAILS_LABEL, false);
-		detailsButton.setEnabled(false);
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or Details button in
-	 * this dialog. If the Ok button was pressed then close this dialog. If the Details button was
-	 * pressed then toggle the displaying of the error details area. Note that the Details button
-	 * will only be visible if the error being displayed specifies child details.
-	 */
-	protected void buttonPressed(int id) {
-		if (id == IDialogConstants.DETAILS_ID) { // was the details button pressed?
-			toggleDetailsArea();
-		} else {
-			logStatus();
-			super.buttonPressed(id);
-
-		}
-	}
-
-	/*
-	 * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage()
-	 */
-
-
-	protected Image getImage() {
-		switch (getSeverity()) {
-			case IStatus.ERROR :
-				return this.getErrorImage();
-			case IStatus.WARNING :
-				return this.getWarningImage();
-			default :
-				return this.getInfoImage();
-		}
-	}
-
-	protected Text createDropDownText(Composite parent) {
-		// create the list
-		text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
-		// fill the list
-		populateText(text);
-
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-		data.horizontalSpan = 2;
-		data.heightHint = text.getLineHeight() * LIST_ITEM_COUNT;
-		text.setLayoutData(data);
-		textCreated = true;
-		return text;
-	}
-
-	private void logStatus() {
-		Iterator aenum = statusList.iterator();
-		StringBuffer sb = new StringBuffer();
-		sb.append(message);
-		while (aenum.hasNext()) {
-			IStatus childStatus = (IStatus) aenum.next();
-			populateText(sb, childStatus, 0);
-		}
-		Logger.getLogger().logInfo(sb.toString());
-
-	}
-
-	/**
-	 * Populates the list using this error dialog's status object. This walks the child stati of the
-	 * status object and displays them in a list. The format for each entry is status_path :
-	 * status_message If the status's path was null then it (and the colon) are omitted.
-	 */
-	private void populateText(Text someText) {
-		Iterator aenum = statusList.iterator();
-		StringBuffer sb = new StringBuffer();
-		while (aenum.hasNext()) {
-			IStatus childStatus = (IStatus) aenum.next();
-			//sb.append("Deployment results for " + childStatus.);
-			populateText(sb, childStatus, 0);
-		}
-		someText.setText(sb.toString());
-
-	}
-
-	private void populateText(StringBuffer sb, IStatus status, int nesting) {
-		for (int i = 0; i < nesting; i++) {
-			sb.append("  "); //$NON-NLS-1$
-		}
-		sb.append(getMessageForDisplay(status));
-		sb.append('\n');
-		IStatus[] children = status.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			populateText(sb, children[i], nesting + 1);
-		}
-	}
-
-	/**
-	 * Toggles the unfolding of the details area. This is triggered by the user pressing the details
-	 * button.
-	 */
-	private void toggleDetailsArea() {
-		Point windowSize = getShell().getSize();
-		Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		if (textCreated) {
-			text.dispose();
-			textCreated = false;
-			detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		} else {
-			text = createDropDownText((Composite) getContents());
-			detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-			text.setEditable(false);
-			text.setBackground(DESC_COLOR);
-		}
-
-		Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
-	}
-
-	public String getMessageForDisplay(IStatus status) {
-		String messageString = status.getMessage();
-		return messageString;
-
-	}
-
-	protected String getSeverityText(IStatus status) {
-		switch (status.getSeverity()) {
-			case IStatus.ERROR :
-				return ERROR_TEXT;
-			case IStatus.WARNING :
-				return WARNING_TEXT;
-			case IStatus.INFO :
-				return INFO_TEXT;
-			case IStatus.OK :
-				return OK_TEXT;
-			default :
-				return ""; //$NON-NLS-1$
-		}
-	}
-
-	private void setSeverity(int sev) {
-		if (severity == IStatus.ERROR)
-			return;
-		if (sev == IStatus.ERROR)
-			severity = IStatus.ERROR;
-		else if (sev == IStatus.WARNING) {
-			severity = IStatus.WARNING;
-		}
-	}
-
-	private int getSeverity() {
-		return severity;
-	}
-
-	private int computeSeverity() {
-		Iterator aenum = statusList.iterator();
-		while (aenum.hasNext()) {
-			IStatus childStatus = (IStatus) aenum.next();
-			setSeverity(childStatus.getSeverity());
-			if (getSeverity() == IStatus.ERROR)
-				return getSeverity();
-			computeSeverity(childStatus);
-			if (getSeverity() == IStatus.ERROR)
-				getSeverity();
-		}
-		return getSeverity();
-	}
-
-	private void computeSeverity(IStatus status) {
-		IStatus[] children = status.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			computeSeverity(children[i]);
-			if (getSeverity() == IStatus.ERROR)
-				return;
-		}
-	}
-
-	/*
-	 * (non-Javadoc) Method declared in Window.
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(DEPLOY_DIALOG_TITLE);
-		//shell.setSize(600,200); don't set the size this breaks the dialog for linux.
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog.
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Control control = super.createDialogArea(parent);
-		setMessage(DEPLOYMENT_IN_PROGRESS);
-		return control;
-	}
-
-	/**
-	 * Set the message in the message label.
-	 */
-	private void setMessage(String messageString) {
-		//must not set null text in a label
-		message = messageString == null ? "" : messageString; //$NON-NLS-1$
-		if (messageLabel == null || messageLabel.isDisposed())
-			return;
-		messageLabel.setText(message);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployUIConstants.java
deleted file mode 100644
index dfe358952..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployUIConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public interface J2EEDeployUIConstants {
-	public static final String ERROR_TEXT = J2EEUIMessages.getResourceString("DEPLOY_ERROR_TEXT"); //$NON-NLS-1$
-	public static final String WARNING_TEXT = J2EEUIMessages.getResourceString("DEPLOY_WARNING_TEXT"); //$NON-NLS-1$
-	public static final String INFO_TEXT = J2EEUIMessages.getResourceString("DEPLOY_INFO_TEXT"); //$NON-NLS-1$
-	public static final String OK_TEXT = J2EEUIMessages.getResourceString("DEPLOY_OK_TEXT"); //$NON-NLS-1$
-	public static final String DEPLOYMENT_IN_PROGRESS = J2EEUIMessages.getResourceString("DEPLOYMENT_IN_PROGRESS"); //$NON-NLS-1$
-	public static final String DEPLOY_SUCCESS_REPORT = J2EEUIMessages.getResourceString("DEPLOY_SUCCESS_REPORT"); //$NON-NLS-1$
-	public static final String DEPLOY_WARNINGS_REPORT = J2EEUIMessages.getResourceString("DEPLOY_WARNINGS_REPORT"); //$NON-NLS-1$
-	public static final String DEPLOY_ERRORS_REPORT = J2EEUIMessages.getResourceString("DEPLOY_ERRORS_REPORT"); //$NON-NLS-1$
-	public static final String DEPLOY_DIALOG_TITLE = J2EEUIMessages.getResourceString("DEPLOY_DIALOG_TITLE"); //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameDialog.java
deleted file mode 100644
index 6dcbf118d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameDialog.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.widgets.Shell;
-
-
-public abstract class J2EERenameDialog extends MessageDialog implements J2EERenameUIConstants {
-
-	protected RenameOptions renameOptions;
-	protected String currentName = null;
-
-	/**
-	 * Constructor for J2EERenameDialog.
-	 * 
-	 * @param parentShell
-	 * @param dialogTitle
-	 * @param dialogTitleImage
-	 * @param dialogMessage
-	 * @param dialogImageType
-	 * @param dialogButtonLabels
-	 * @param defaultIndex
-	 */
-	public J2EERenameDialog(Shell parentShell, String dialogTitle, String name) {
-		super(parentShell, dialogTitle, null, RENAME_DIALOG_MESSAGE, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0);
-		currentName = name;
-	}
-
-	public RenameOptions getRenameOptions() {
-		return renameOptions;
-	}
-
-
-	public abstract void createRenameOptions();
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == 0)
-			createRenameOptions();
-		super.buttonPressed(buttonId);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameUIConstants.java
deleted file mode 100644
index baa574d2a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EERenameUIConstants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public interface J2EERenameUIConstants {
-	String RENAME = J2EEUIMessages.getResourceString("Rename_1"); //$NON-NLS-1$
-	String RENAME_PROJECTS = J2EEUIMessages.getResourceString("Rename_selected_project_2"); //$NON-NLS-1$
-	String RENAME_MODULES = J2EEUIMessages.getResourceString("Rename_module_in_all_Enterprise_Applications_3"); //$NON-NLS-1$
-	String RENAME_MODULES_OTHER = J2EEUIMessages.getResourceString("Rename_module_in_all_other_Enterprise_Applications_4"); //$NON-NLS-1$
-	String RENAME_MODULE_DEPENDENCIES = J2EEUIMessages.getResourceString("Rename_module_dependencies_referencing_selected_project_5"); //$NON-NLS-1$
-	String RENAME_MODULE_OPTIONS = J2EEUIMessages.getResourceString("Rename_Module_Options_6"); //$NON-NLS-1$
-	String RENAME_EAR_OPTIONS = J2EEUIMessages.getResourceString("Rename_Enterprise_Application_Options_7"); //$NON-NLS-1$
-	String RENAME_NOT_COMPLETED = J2EEUIMessages.getResourceString("Rename_could_not_be_completed_8"); //$NON-NLS-1$
-	String RENAME_ERROR = J2EEUIMessages.getResourceString("Rename_error_9"); //$NON-NLS-1$
-	String RENAME_DIALOG_MESSAGE = J2EEUIMessages.getResourceString("What_would_you_like_to_rename_this_to__10"); //$NON-NLS-1$
-	String RENAME_CONTEXT_ROOT = J2EEUIMessages.getResourceString("Context_Root__11"); //$NON-NLS-1$
-	String RENAME_EAR_PROJECTS = J2EEUIMessages.getResourceString("Rename_selected_Enterprise_Application_project_only_12"); //$NON-NLS-1$
-	String RENAME_REFERENCED_PROJECTS = J2EEUIMessages.getResourceString("Also_rename_module_and_utility_Java_projects_13"); //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java
deleted file mode 100644
index 8808b1db2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here. Creation date: (9/7/2001 11:28:24 AM)
- * 
- * @author: Administrator
- */
-public class ListMessageDialog extends org.eclipse.jface.dialogs.MessageDialog {
-	protected String[] listItems;
-	protected List list;
-
-	/**
-	 * EJBSelectiveImportDialog constructor comment.
-	 * 
-	 * @param parentShell
-	 *            org.eclipse.swt.widgets.Shell
-	 * @param dialogTitle
-	 *            java.lang.String
-	 * @param dialogTitleImage
-	 *            org.eclipse.swt.graphics.Image
-	 * @param dialogMessage
-	 *            java.lang.String
-	 * @param dialogImageType
-	 *            int
-	 * @param dialogButtonLabels
-	 *            java.lang.String[]
-	 * @param defaultIndex
-	 *            int
-	 */
-	public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex) {
-		super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
-	}
-
-	/**
-	 * ListMessageDialog constructor comment.
-	 * 
-	 * @param parentShell
-	 *            org.eclipse.swt.widgets.Shell
-	 * @param dialogTitle
-	 *            java.lang.String
-	 * @param dialogTitleImage
-	 *            org.eclipse.swt.graphics.Image
-	 * @param dialogMessage
-	 *            java.lang.String
-	 * @param dialogImageType
-	 *            int
-	 * @param dialogButtonLabels
-	 *            java.lang.String[]
-	 * @param defaultIndex
-	 *            int
-	 */
-	public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex, String[] names) {
-		super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
-		listItems = names;
-	}
-
-	/**
-	 * Creates and returns the contents of an area of the dialog which appears below the message and
-	 * above the button bar.
-	 * <p>
-	 * The default implementation of this framework method returns <code>null</code>. Subclasses
-	 * may override.
-	 * </p>
-	 * 
-	 * @param the
-	 *            parent composite to contain the custom area
-	 * @return the custom area control, or <code>null</code>
-	 */
-	protected Control createCustomArea(Composite parent) {
-
-		Composite composite = new Composite(parent, 0);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		if (listItems != null) {
-			list = new List(composite, SWT.BORDER);
-			GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-			list.setLayoutData(data);
-			list.setItems(listItems);
-		}
-
-		return composite;
-
-	}
-
-	/**
-	 * Convenience method to open a simple confirm (OK/Cancel) dialog.
-	 * 
-	 * @param parent
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param title
-	 *            the dialog's title, or <code>null</code> if none
-	 * @param message
-	 *            the message
-	 * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
-	 */
-	public static boolean openConfirm(Shell parent, String title, String message, String[] items) {
-		ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
-					// window icon
-					message, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0, items); // OK
-		// is
-		// the
-		// default
-		return dialog.open() == 0;
-	}
-
-	/**
-	 * Convenience method to open a standard error dialog.
-	 * 
-	 * @param parent
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param title
-	 *            the dialog's title, or <code>null</code> if none
-	 * @param message
-	 *            the message
-	 */
-	public static void openError(Shell parent, String title, String message, String[] items) {
-		ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
-					// window icon
-					message, ERROR, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is the
-		// default
-		dialog.open();
-		return;
-	}
-
-	/**
-	 * Convenience method to open a standard information dialog.
-	 * 
-	 * @param parent
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param title
-	 *            the dialog's title, or <code>null</code> if none
-	 * @param message
-	 *            the message
-	 */
-	public static void openInformation(Shell parent, String title, String message, String[] items) {
-		ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
-					// window icon
-					message, INFORMATION, new String[]{IDialogConstants.OK_LABEL}, 0, items);
-		// ok is the default
-		dialog.open();
-		return;
-	}
-
-	/**
-	 * Convenience method to open a simple Yes/No question dialog.
-	 * 
-	 * @param parent
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param title
-	 *            the dialog's title, or <code>null</code> if none
-	 * @param message
-	 *            the message
-	 * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
-	 */
-	public static boolean openQuestion(Shell parent, String title, String message, String[] items) {
-		ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
-					// window icon
-					message, QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0, items); // yes
-		// is
-		// the
-		// default
-		return dialog.open() == 0;
-	}
-
-	/**
-	 * Convenience method to open a standard warning dialog.
-	 * 
-	 * @param parent
-	 *            the parent shell of the dialog, or <code>null</code> if none
-	 * @param title
-	 *            the dialog's title, or <code>null</code> if none
-	 * @param message
-	 *            the message
-	 */
-	public static void openWarning(Shell parent, String title, String message, String[] items) {
-		ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
-					// window icon
-					message, WARNING, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is
-		// the
-		// default
-		dialog.open();
-		return;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARComposite.java
deleted file mode 100644
index c74e3b81d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARComposite.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-public class RenameEARComposite extends Composite implements J2EERenameUIConstants, Listener, ICheckStateListener {
-
-	protected Button renameAppProjectsBtn;
-	protected Button renameRefProjectsBtn;
-	protected Composite radioComposite;
-	protected Button detailsBtn;
-	protected RenameModuleReferencesComposite moduleRefsComposite;
-	protected CheckboxTableViewer projectsList;
-	protected boolean listCreated = false;
-	protected Map referencedProjects;
-	protected WorkbenchLabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
-
-	/**
-	 * Constructor for RenameEARComposite.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public RenameEARComposite(Composite parent, int style, Set referencedProjects) {
-		super(parent, style);
-		initReferencedProjects(referencedProjects);
-		addChildren();
-	}
-
-	/**
-	 * Answer the referenced projects which the user has chosen to also rename
-	 */
-	public java.util.List getSelectedReferencedProjects() {
-		if (renameAppProjectsBtn.getSelection())
-			return Collections.EMPTY_LIST;
-		java.util.List result = new ArrayList();
-		for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry element = (Map.Entry) iter.next();
-			boolean isSelected = ((Boolean) element.getValue()).booleanValue();
-			if (isSelected)
-				result.add(element.getKey());
-		}
-		return result;
-	}
-
-	/**
-	 * @see J2EERenameDialog#createRenameOptions()
-	 */
-	public RenameOptions createRenameOptions() {
-		RenameOptions opts = new RenameOptions();
-		opts.setIsEARRename(true);
-		opts.setRenameProjects(true);
-		opts.setRenameModuleDependencies(moduleRefsComposite.shouldRenameModuleDependencies());
-		opts.setRenameModules(moduleRefsComposite.shouldRenameModules());
-		opts.setSelectedReferencedProjects(getSelectedReferencedProjects());
-		return opts;
-	}
-
-
-
-	protected void initReferencedProjects(Set projects) {
-		referencedProjects = new HashMap();
-		for (Iterator iter = projects.iterator(); iter.hasNext();) {
-			IProject project = (IProject) iter.next();
-			referencedProjects.put(project, Boolean.TRUE);
-		}
-	}
-
-	protected void addChildren() {
-		setLayout();
-		addRadioComposite();
-		moduleRefsComposite = new RenameModuleReferencesComposite(this, SWT.NONE, true);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		data.horizontalIndent = 10;
-		moduleRefsComposite.setLayoutData(data);
-	}
-
-	protected void setLayout() {
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 1;
-		setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		setLayoutData(data);
-	}
-
-	protected void addRadioComposite() {
-		radioComposite = new Composite(this, SWT.NONE);
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 2;
-		radioComposite.setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		radioComposite.setLayoutData(data);
-		renameAppProjectsBtn = new Button(radioComposite, SWT.RADIO);
-		renameAppProjectsBtn.setText(RENAME_EAR_PROJECTS);
-		renameAppProjectsBtn.addListener(SWT.Selection, this);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		renameAppProjectsBtn.setLayoutData(data);
-
-		renameRefProjectsBtn = new Button(radioComposite, SWT.RADIO);
-		renameRefProjectsBtn.setText(RENAME_REFERENCED_PROJECTS);
-		renameRefProjectsBtn.addListener(SWT.Selection, this);
-		renameRefProjectsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		detailsBtn = new Button(radioComposite, SWT.PUSH);
-		detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		detailsBtn.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		detailsBtn.addListener(SWT.Selection, this);
-		detailsBtn.setEnabled(false);
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == renameAppProjectsBtn)
-			renameAppProjectsBtnSelected();
-		else if (event.widget == renameRefProjectsBtn)
-			renameRefProjectsBtnSelected();
-		else if (event.widget == detailsBtn)
-			detailsBtnSelected();
-	}
-
-	protected void renameAppProjectsBtnSelected() {
-		if (renameAppProjectsBtn.getSelection()) {
-			if (listCreated)
-				toggleDetailsArea();
-			detailsBtn.setEnabled(false);
-			moduleRefsComposite.setButtonsEnabled(false);
-		}
-	}
-
-	protected void renameRefProjectsBtnSelected() {
-		if (renameRefProjectsBtn.getSelection()) {
-			detailsBtn.setEnabled(true);
-			moduleRefsComposite.setButtonsEnabled(true);
-		}
-	}
-
-	/**
-	 * Toggles the unfolding of the details area. This is triggered by the user pressing the details
-	 * button.
-	 */
-	protected void toggleDetailsArea() {
-		Point windowSize = getShell().getSize();
-		Point oldSize = getParent().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		if (listCreated) {
-			projectsList.getControl().dispose();
-			listCreated = false;
-			detailsBtn.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-		} else {
-			createDropDownList();
-			detailsBtn.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-		}
-
-		Point newSize = getParent().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
-		getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
-	}
-
-	protected void createDropDownList() {
-		// create the list
-		projectsList = CheckboxTableViewer.newCheckList(radioComposite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		projectsList.setLabelProvider(createLabelProvider());
-		projectsList.setSorter(new ViewerSorter() {/*viewersorter*/});
-		projectsList.addCheckStateListener(this);
-		// fill the list
-		populateList();
-
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.heightHint = projectsList.getTable().getItemHeight() * referencedProjects.size();
-		data.horizontalSpan = 2;
-		data.horizontalIndent = 10;
-		projectsList.getTable().setLayoutData(data);
-
-		listCreated = true;
-	}
-
-	protected void populateList() {
-		for (Iterator iter = referencedProjects.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			projectsList.add(entry.getKey());
-			boolean checked = ((Boolean) entry.getValue()).booleanValue();
-			projectsList.setChecked(entry.getKey(), checked);
-		}
-	}
-
-	protected void detailsBtnSelected() {
-		toggleDetailsArea();
-	}
-
-	/**
-	 * @see ICheckStateListener#checkStateChanged(CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		referencedProjects.put(event.getElement(), new Boolean(event.getChecked()));
-	}
-
-	protected ITableLabelProvider createLabelProvider() {
-		return new ITableLabelProvider() {
-			public void dispose() {
-				//dispose
-			}
-
-			public Image getColumnImage(Object element, int columnIndex) {
-				return workbenchLabelProvider.getImage(element);
-			}
-
-			/**
-			 * @see ITableLabelProvider#getColumnText(Object, int)
-			 */
-			public String getColumnText(Object element, int columnIndex) {
-				return workbenchLabelProvider.getText(element);
-			}
-
-			public void addListener(ILabelProviderListener listener) {
-				//do nothing
-			}
-
-			public boolean isLabelProperty(Object element, String property) {
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener) {
-				//do nothing
-			}
-		};
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java
deleted file mode 100644
index 770e058c6..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java
+++ /dev/null
@@ -1,60 +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.j2ee.internal.dialogs;
-
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class RenameEARDialog extends J2EERenameDialog {
-	protected RenameEARComposite renameComposite;
-	protected Set referencedProjects;
-
-	/**
-	 * Constructor for RenameEARDialog.
-	 * 
-	 * @param parentShell
-	 * @param dialogTitle
-	 */
-	public RenameEARDialog(Shell parentShell, Set referencedProjects, String name) {
-		super(parentShell, RENAME_EAR_OPTIONS, name);
-		this.referencedProjects = referencedProjects;
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.dialogs.MessageDialog#createCustomArea(Composite)
-	 */
-	protected Control createCustomArea(Composite parent) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.RENAME_EAR_DIALOG_1); //$NON-NLS-1$
-		renameComposite = new RenameEARComposite(parent, SWT.NONE, referencedProjects);
-		//		renameComposite.setNewName(currentName);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalIndent = 10;
-		renameComposite.setLayoutData(data);
-		return renameComposite;
-	}
-
-	/**
-	 * @see J2EERenameDialog#createRenameOptions()
-	 */
-	public void createRenameOptions() {
-		renameOptions = renameComposite.createRenameOptions();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleComposite.java
deleted file mode 100644
index 0923fced8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleComposite.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-
-
-public class RenameModuleComposite extends Composite implements J2EERenameUIConstants, Listener {
-
-	// protected Button renameProjectsCheckBox;
-	protected RenameModuleReferencesComposite moduleRefsComposite;
-	protected Text newNameText = null;
-	protected Text newContextRootText = null;
-	protected Label newContextRootLabel = null;
-	protected String oldName = null;
-	protected Button OKButton = null;
-	protected Label statusMessageLabel = null;
-
-	/**
-	 * Constructor for RenameModuleComposite.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public RenameModuleComposite(Composite parent, int style) {
-		super(parent, style);
-		addChildren();
-	}
-
-	protected void addChildren() {
-		addRenameProjectsGroup();
-		addSeparator();
-		addRenameModuleRefsComposite();
-		//Add in a label for status messages if required
-		statusMessageLabel = new Label(this, SWT.NONE);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		statusMessageLabel.setLayoutData(data);
-		statusMessageLabel.setFont(this.getFont());
-	}
-
-	protected void addRenameProjectsGroup() {
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 2;
-		setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		setLayoutData(data);
-
-		newNameText = new Text(this, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		newNameText.setLayoutData(data);
-
-		newContextRootLabel = new Label(this, SWT.NONE);
-		newContextRootLabel.setText(RENAME_CONTEXT_ROOT);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		newContextRootLabel.setLayoutData(data);
-
-		newContextRootText = new Text(this, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		newContextRootText.setLayoutData(data);
-
-		/*
-		 * renameProjectsCheckBox = new Button(this, SWT.CHECK);
-		 * renameProjectsCheckBox.setText(RENAME_PROJECTS);
-		 * renameProjectsCheckBox.setSelection(true);
-		 * renameProjectsCheckBox.addListener(SWT.Selection, this); data = new
-		 * GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2;
-		 * renameProjectsCheckBox.setLayoutData(data);
-		 */
-	}
-
-	protected void addRenameModuleRefsComposite() {
-		moduleRefsComposite = new RenameModuleReferencesComposite(this, SWT.NONE, false);
-	}
-
-	protected void addSeparator() {
-		Label sep = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		sep.setLayoutData(data);
-	}
-
-	public boolean shouldRenameProjects() {
-		//  return renameProjectsCheckBox.getSelection();
-		// always rename the project
-		return true;
-	}
-
-	public boolean shouldRenameModuleDependencies() {
-		return moduleRefsComposite.shouldRenameModuleDependencies();
-	}
-
-	public boolean shouldRenameModules() {
-		return moduleRefsComposite.shouldRenameModules();
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == newNameText && OKButton != null) {
-			String newName = newNameText.getText();
-			if (newName.trim().length() == 0) {
-				statusMessageLabel.setText("");//$NON-NLS-1$
-				OKButton.setEnabled(false);
-				return;
-			}
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IProject newProject = root.getProject(newName);
-			if (newProject.exists()) {
-				statusMessageLabel.setForeground(JFaceColors.getErrorText(statusMessageLabel.getDisplay()));
-				String[] names = {newName};
-				statusMessageLabel.setText(MessageFormat.format(J2EEUIMessages.getResourceString("Project_already_exists."), names)); //$NON-NLS-1$
-				OKButton.setEnabled(false);
-			} else {
-				statusMessageLabel.setText("");//$NON-NLS-1$
-				OKButton.setEnabled(true);
-			}
-		}
-	}
-
-	public String getNewName()
-
-	{
-		return newNameText.getText();
-	}
-
-	public void setNewName(String newName) {
-		oldName = newName;
-		newNameText.setText(newName);
-		newNameText.selectAll();
-		newNameText.addListener(SWT.Modify, this);
-	}
-
-	public String getNewContextRoot() {
-		return newContextRootText.getText();
-	}
-
-	public void setNewContextRoot(String newContextRoot) {
-		if (newContextRoot != null && newContextRoot.length() > 1) {
-			newContextRootText.setText(newContextRoot);
-		} else {
-			newContextRootLabel.setVisible(false);
-			newContextRootText.setVisible(false);
-		}
-	}
-
-	/**
-	 * Sets the OKButton.
-	 * 
-	 * @param OKButton
-	 *            The OKButton to set
-	 */
-	public void setOKButton(Button oKButton) {
-		OKButton = oKButton;
-		OKButton.setEnabled(false);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleDialog.java
deleted file mode 100644
index a5ea814b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleDialog.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.rename.RenameOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-public class RenameModuleDialog extends J2EERenameDialog implements J2EERenameUIConstants {
-
-	protected RenameModuleComposite renameComposite;
-	protected String contextRoot = null;
-
-	public RenameModuleDialog(Shell parentShell, String name, String oldContextRoot) {
-		super(parentShell, RENAME_MODULE_OPTIONS, name);
-		contextRoot = oldContextRoot;
-	}
-
-	protected Control createCustomArea(Composite parent) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJ2EEUIContextIds.RENAME_MODULE_DIALOG_1); //$NON-NLS-1$
-		renameComposite = new RenameModuleComposite(parent, SWT.NONE);
-		renameComposite.setNewName(currentName);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalIndent = 10;
-		renameComposite.setLayoutData(data);
-		renameComposite.setNewContextRoot(contextRoot);
-		return renameComposite;
-	}
-
-	public void createRenameOptions() {
-		renameOptions = new RenameOptions();
-		renameOptions.setRenameProjects(renameComposite.shouldRenameProjects());
-		renameOptions.setRenameModules(renameComposite.shouldRenameModules());
-		renameOptions.setRenameModuleDependencies(renameComposite.shouldRenameModuleDependencies());
-		renameOptions.setNewName(renameComposite.getNewName());
-		renameOptions.setNewContextRoot(renameComposite.getNewContextRoot());
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on Dialog.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		Button OKButton = null;
-		super.createButtonsForButtonBar(parent);
-		OKButton = getButton(0);
-		renameComposite.setOKButton(OKButton);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleReferencesComposite.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleReferencesComposite.java
deleted file mode 100644
index 7614aabb0..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameModuleReferencesComposite.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.dialogs;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-public class RenameModuleReferencesComposite extends Composite implements J2EERenameUIConstants, Listener {
-
-	protected Button renameModulesCheckbox;
-	protected Button renameModuleDependenciesCheckbox;
-	protected boolean isEARRename;
-
-	/**
-	 * Constructor for RenameModuleReferencesComposite.
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public RenameModuleReferencesComposite(Composite parent, int style, boolean isEARRename) {
-		super(parent, style);
-		this.isEARRename = isEARRename;
-		addChildren();
-	}
-
-	protected void addChildren() {
-		GridLayout lay = new GridLayout();
-		lay.numColumns = 1;
-		setLayout(lay);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		setLayoutData(data);
-
-		addRenameModulesCheckbox();
-		addRenameModuleDependenciesCheckbox();
-	}
-
-	protected void addRenameModuleDependenciesCheckbox() {
-		renameModuleDependenciesCheckbox = new Button(this, SWT.CHECK);
-		renameModuleDependenciesCheckbox.setSelection(true);
-		renameModuleDependenciesCheckbox.setText(RENAME_MODULE_DEPENDENCIES);
-
-	}
-
-	protected void addRenameModulesCheckbox() {
-		renameModulesCheckbox = new Button(this, SWT.CHECK);
-		renameModulesCheckbox.setSelection(true);
-		String label = isEARRename ? RENAME_MODULES_OTHER : RENAME_MODULES;
-		renameModulesCheckbox.setText(label);
-		renameModulesCheckbox.addListener(SWT.Selection, this);
-	}
-
-	public boolean shouldRenameModuleDependencies() {
-		return renameModuleDependenciesCheckbox.getSelection();
-	}
-
-	public boolean shouldRenameModules() {
-		return renameModulesCheckbox.getSelection();
-	}
-
-	public void setButtonsEnabled(boolean enabled) {
-		renameModuleDependenciesCheckbox.setSelection(enabled);
-		renameModulesCheckbox.setSelection(enabled);
-		renameModuleDependenciesCheckbox.setEnabled(enabled);
-		renameModulesCheckbox.setEnabled(enabled);
-	}
-
-	/**
-	 * @see Listener#handleEvent(Event)
-	 */
-	public void handleEvent(Event event) {
-		if (event.widget == renameModulesCheckbox && renameModulesCheckbox.getSelection() && !renameModuleDependenciesCheckbox.getSelection())
-			renameModuleDependenciesCheckbox.setSelection(true);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java
deleted file mode 100644
index a49b9220a..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java
+++ /dev/null
@@ -1,128 +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.j2ee.internal.dialogs;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.server.core.IRuntime;
-
-
-/**
- * @author Administrator
- *
- */
-public class RuntimeSelectionDialog extends MessageDialog {
-	private IProject project = null;
-	private String configuredMessage;
-
-	/**
-	 * @param parentShell
-	 * @param dialogTitle
-	 * @param dialogTitleImage
-	 * @param dialogMessage
-	 * @param dialogImageType
-	 * @param dialogButtonLabels
-	 * @param defaultIndex
-	 */
-	public RuntimeSelectionDialog(Shell parentShell, String dialogTitle,
-			Image dialogTitleImage, String dialogMessage, int dialogImageType,
-			String[] dialogButtonLabels, int defaultIndex, IProject project) {
-		super(parentShell, dialogTitle, dialogTitleImage, dialogMessage,
-				dialogImageType, dialogButtonLabels, defaultIndex);
-		this.project = project;
-		this.configuredMessage = MessageFormat.format(J2EEUIMessages.getResourceString("DEPLOY_RUNTIME_CONFIGURED"), new String []{project.getName()});
-	}
-	
-	protected Control createCustomArea(Composite parent) {
-
-		//Composite composite = new Composite(parent, 0);
-		createHyperLink(parent);
-		return parent;
-
-	}
-	
-	private void createHyperLink(Composite parent) {
-		Hyperlink link = new Hyperlink(parent,SWT.None);
-		GridData layout = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		layout.horizontalSpan = 2;
-		link.setLayoutData(layout);
-		link.setUnderlined(true);
-		Color color = new Color(parent.getDisplay(),new RGB(0,0,255) );
-		link.setForeground(color);
-		link.setText("Configure Target Runtime...");
-		link.addHyperlinkListener(new IHyperlinkListener() {
-			public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
-
-			public void linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent e) {
-			}
-
-			public void linkExited(org.eclipse.ui.forms.events.HyperlinkEvent e) {
-			}
-
-			public void linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent e) {
-				String id = getPreferencePageID();
-				PreferencesUtil.createPropertyDialogOn(getShell(), project, id, new String[]{id}, DATA_NO_LINK).open(); //
-				//(getShell(), id, new String[]{id}, DATA_NO_LINK).open();
-				try {
-					updateWidgets();
-				} catch (Exception ie) {
-
-				}
-			}
-
-			private String getPreferencePageID() {
-				return "org.eclipse.wst.common.project.facet.ui.internal.RuntimesPropertyPage";
-			}
-		});
-		
-	}
-	
-	private void updateWidgets() {
-		if (getTargetRuntime() != null) {
-		  messageLabel.setText(configuredMessage);
-		  imageLabel.setImage(this.getInfoImage());
-		} else {
-		  messageLabel.setText(message);
-		  imageLabel.setImage(getErrorImage());
-		}
-				
-	}
-
-	private IRuntime getTargetRuntime() {
-		try {
-			IRuntime runtime = J2EEProjectUtilities.getServerRuntime(project);
-			return runtime;
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java
deleted file mode 100644
index 62d6907f2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-/**
- * @author jialin
- * 
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-import java.util.Comparator;
-
-import org.eclipse.jface.util.Assert;
-
-/**
- * Quick sort to sort key-value pairs. The keys and arrays are specified in
- * separate arrays.
- * 
- * @plannedfor 2.0
- */
-public class TwoArrayQuickSorter {
-
-	private Comparator fComparator;
-
-	/**
-	 * Default comparator.
-	 */
-	public static final class StringComparator implements Comparator {
-		private boolean fIgnoreCase;
-
-		StringComparator(boolean ignoreCase) {
-			fIgnoreCase = ignoreCase;
-		}
-
-		public int compare(Object left, Object right) {
-			return fIgnoreCase ? ((String) left).compareToIgnoreCase((String) right) : ((String) left).compareTo((String) right);
-		}
-	}
-
-	/**
-	 * Creates a sorter with default string comparator. The keys are assumed to
-	 * be strings.
-	 * 
-	 * @param ignoreCase
-	 *            specifies whether sorting is case sensitive or not.
-	 */
-	public TwoArrayQuickSorter(boolean ignoreCase) {
-		fComparator = new StringComparator(ignoreCase);
-	}
-
-	/**
-	 * Creates a sorter with a comparator.
-	 * 
-	 * @param comparator
-	 *            the comparator to order the elements. The comparator must not
-	 *            be <code>null</code>.
-	 */
-	public TwoArrayQuickSorter(Comparator comparator) {
-		fComparator = comparator;
-	}
-
-	/**
-	 * Sorts keys and values in parallel.
-	 * 
-	 * @param keys
-	 *            the keys to use for sorting.
-	 * @param values
-	 *            the values associated with the keys.
-	 */
-	public void sort(Object[] keys, Object[] values) {
-		if ((keys == null) || (values == null)) {
-			Assert.isTrue(false, "Either keys or values in null"); //$NON-NLS-1$
-			return;
-		}
-
-		if (keys.length <= 1)
-			return;
-
-		internalSort(keys, values, 0, keys.length - 1);
-	}
-
-	private void internalSort(Object[] keys, Object[] values, int left, int right) {
-		int original_left = left;
-		int original_right = right;
-
-		Object mid = keys[(left + right) / 2];
-		do {
-			while (fComparator.compare(keys[left], mid) < 0)
-				left++;
-
-			while (fComparator.compare(mid, keys[right]) < 0)
-				right--;
-
-			if (left <= right) {
-				swap(keys, left, right);
-				swap(values, left, right);
-				left++;
-				right--;
-			}
-		} while (left <= right);
-
-		if (original_left < right)
-			internalSort(keys, values, original_left, right);
-
-		if (left < original_right)
-			internalSort(keys, values, left, original_right);
-	}
-
-	/*
-	 * Swaps x[a] with x[b].
-	 */
-	private static final void swap(Object x[], int a, int b) {
-		Object t = x[a];
-		x[a] = x[b];
-		x[b] = t;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java
deleted file mode 100644
index 6c430f694..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-/**
- * This class was derived from JavaSearchScope as that class did not have a
- * provision to exclude classpath entries that are not exported A Java-specific
- * scope for searching relative to one or more java elements.
- */
-public class TypeJavaSearchScope implements IJavaSearchScope {
-
-	private boolean includeExportedClassPathEntriesOnly = true;
-
-	private ArrayList elements;
-
-	/*
-	 * The paths of the resources in this search scope (or the classpath
-	 * entries' paths if the resources are projects)
-	 */
-	private IPath[] paths;
-	private boolean[] pathWithSubFolders;
-	private int pathsCount;
-
-	private IPath[] enclosingProjectsAndJars;
-
-	public TypeJavaSearchScope() {
-		this.initialize();
-
-		// disabled for now as this could be expensive
-		// JavaModelManager.getJavaModelManager().rememberScope(this);
-	}
-
-	private void addEnclosingProjectOrJar(IPath path) {
-		int length = this.enclosingProjectsAndJars.length;
-		for (int i = 0; i < length; i++) {
-			if (this.enclosingProjectsAndJars[i].equals(path))
-				return;
-		}
-		System.arraycopy(this.enclosingProjectsAndJars, 0, this.enclosingProjectsAndJars = new IPath[length + 1], 0, length);
-		this.enclosingProjectsAndJars[length] = path;
-	}
-
-	/**
-	 * Method addProject. This method adds all the classpath entries for the
-	 * current project to the search scope.
-	 * 
-	 * @param javaProject
-	 * @param includesPrereqProjects
-	 * @param visitedProjects
-	 * @throws JavaModelException
-	 */
-	public void addProject(IJavaProject javaProject, boolean includesPrereqProjects, HashSet visitedProjects) throws JavaModelException {
-		IProject project = javaProject.getProject();
-		if (!project.isAccessible() || !visitedProjects.add(project))
-			return;
-
-		this.addEnclosingProjectOrJar(project.getFullPath());
-
-		IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
-		IJavaModel model = javaProject.getJavaModel();
-		for (int i = 0, length = entries.length; i < length; i++) {
-			IClasspathEntry entry = entries[i];
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_LIBRARY :
-					IPath path = entry.getPath();
-					this.add(path, true);
-					this.addEnclosingProjectOrJar(path);
-					break;
-				case IClasspathEntry.CPE_PROJECT :
-					if (includesPrereqProjects) {
-						this.add(model.getJavaProject(entry.getPath().lastSegment()), true, visitedProjects);
-					}
-					break;
-				case IClasspathEntry.CPE_SOURCE :
-					this.add(entry.getPath(), true);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Method add. This method filters out all the classpath entries of the
-	 * project which are not exported.
-	 * 
-	 * @param javaProject
-	 * @param includesPrereqProjects
-	 * @param visitedProjects
-	 * @throws JavaModelException
-	 */
-	public void add(IJavaProject javaProject, boolean includesPrereqProjects, HashSet visitedProjects) throws JavaModelException {
-		IProject project = javaProject.getProject();
-		if (!project.isAccessible() || !visitedProjects.add(project))
-			return;
-
-		this.addEnclosingProjectOrJar(project.getFullPath());
-
-		IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
-		IJavaModel model = javaProject.getJavaModel();
-		for (int i = 0, length = entries.length; i < length; i++) {
-			IClasspathEntry entry = entries[i];
-			if (includeExportedClassPathEntriesOnly()) {
-				if (!entry.isExported() && entry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
-					continue;
-			}
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_LIBRARY :
-					IPath path = entry.getPath();
-					this.add(path, true);
-					this.addEnclosingProjectOrJar(path);
-					break;
-				case IClasspathEntry.CPE_PROJECT :
-					if (includesPrereqProjects) {
-						this.add(model.getJavaProject(entry.getPath().lastSegment()), true, visitedProjects);
-					}
-					break;
-				case IClasspathEntry.CPE_SOURCE :
-					this.add(entry.getPath(), true);
-					break;
-			}
-		}
-	}
-	public void add(IJavaElement element) throws JavaModelException {
-		IPackageFragmentRoot root = null;
-		switch (element.getElementType()) {
-			case IJavaElement.JAVA_MODEL :
-				// a workspace sope should be used
-				break;
-			case IJavaElement.JAVA_PROJECT :
-				this.add((IJavaProject) element, true, new HashSet(2));
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT :
-				root = (IPackageFragmentRoot) element;
-				this.add(root.getPath(), true);
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT :
-				root = (IPackageFragmentRoot) element.getParent();
-				if (root.isArchive()) {
-					this.add(root.getPath().append(new Path(element.getElementName().replace('.', '/'))), false);
-				} else {
-					IResource resource = element.getUnderlyingResource();
-					if (resource != null && resource.isAccessible()) {
-						this.add(resource.getFullPath(), false);
-					}
-				}
-				break;
-			default :
-				// remember sub-cu (or sub-class file) java elements
-				if (element instanceof IMember) {
-					if (this.elements == null) {
-						this.elements = new ArrayList();
-					}
-					this.elements.add(element);
-				}
-				this.add(this.fullPath(element), true);
-
-				// find package fragment root including this java element
-				IJavaElement parent = element.getParent();
-				while (parent != null && !(parent instanceof IPackageFragmentRoot)) {
-					parent = parent.getParent();
-				}
-				if (parent instanceof IPackageFragmentRoot) {
-					root = (IPackageFragmentRoot) parent;
-				}
-		}
-
-		if (root != null) {
-			if (root.getKind() == IPackageFragmentRoot.K_BINARY) {
-				this.addEnclosingProjectOrJar(root.getPath());
-			} else {
-				this.addEnclosingProjectOrJar(root.getJavaProject().getProject().getFullPath());
-			}
-		}
-	}
-
-	/**
-	 * Adds the given path to this search scope. Remember if subfolders need to
-	 * be included as well.
-	 */
-	private void add(IPath path, boolean withSubFolders) {
-		if (this.paths.length == this.pathsCount) {
-			System.arraycopy(this.paths, 0, this.paths = new IPath[this.pathsCount * 2], 0, this.pathsCount);
-			System.arraycopy(this.pathWithSubFolders, 0, this.pathWithSubFolders = new boolean[this.pathsCount * 2], 0, this.pathsCount);
-		}
-		this.paths[this.pathsCount] = path;
-		this.pathWithSubFolders[this.pathsCount++] = withSubFolders;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see IJavaSearchScope#encloses(String)
-	 */
-	public boolean encloses(String resourcePathString) {
-		IPath resourcePath;
-		int separatorIndex = resourcePathString.indexOf(JAR_FILE_ENTRY_SEPARATOR);
-		if (separatorIndex != -1) {
-			resourcePath = new Path(resourcePathString.substring(0, separatorIndex)).append(new Path(resourcePathString.substring(separatorIndex + 1)));
-		} else {
-			resourcePath = new Path(resourcePathString);
-		}
-		return this.encloses(resourcePath);
-	}
-
-	/**
-	 * Returns whether this search scope encloses the given path.
-	 */
-	private boolean encloses(IPath path) {
-		for (int i = 0; i < this.pathsCount; i++) {
-			if (this.pathWithSubFolders[i]) {
-				if (this.paths[i].isPrefixOf(path)) {
-					return true;
-				}
-			} else {
-				IPath scopePath = this.paths[i];
-				if (scopePath.isPrefixOf(path) && (scopePath.segmentCount() == path.segmentCount() - 1)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see IJavaSearchScope#encloses(IJavaElement)
-	 */
-	public boolean encloses(IJavaElement element) {
-		if (this.elements != null) {
-			for (int i = 0, length = this.elements.size(); i < length; i++) {
-				IJavaElement scopeElement = (IJavaElement) this.elements.get(i);
-				IJavaElement searchedElement = element;
-				while (searchedElement != null) {
-					if (searchedElement.equals(scopeElement)) {
-						return true;
-					} 
-					searchedElement = searchedElement.getParent();
-				}
-			}
-			return false;
-		}
-		return this.encloses(this.fullPath(element));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see IJavaSearchScope#enclosingProjectsAndJars()
-	 */
-	public IPath[] enclosingProjectsAndJars() {
-		return this.enclosingProjectsAndJars;
-	}
-	private IPath fullPath(IJavaElement element) {
-		if (element instanceof IPackageFragmentRoot) {
-			return ((IPackageFragmentRoot) element).getPath();
-		} 
-		IJavaElement parent = element.getParent();
-		IPath parentPath = parent == null ? null : this.fullPath(parent);
-		IPath childPath;
-		if (element instanceof IPackageFragment) {
-			childPath = new Path(element.getElementName().replace('.', '/'));
-		} else if (element instanceof IOpenable) {
-			childPath = new Path(element.getElementName());
-		} else {
-			return parentPath;
-		}
-		return parentPath == null ? childPath : parentPath.append(childPath);
-	}
-
-	protected void initialize() {
-		this.paths = new IPath[1];
-		this.pathWithSubFolders = new boolean[1];
-		this.pathsCount = 0;
-		this.enclosingProjectsAndJars = new IPath[0];
-	}
-	/**
-	 * Gets the includeExportedClassPathEntriesOnly.
-	 * 
-	 * @return Returns a boolean
-	 */
-	public boolean includeExportedClassPathEntriesOnly() {
-		return includeExportedClassPathEntriesOnly;
-	}
-
-	/**
-	 * Sets the includeExportedClassPathEntriesOnly.
-	 * 
-	 * @param includeExportedClassPathEntriesOnly
-	 *            The includeExportedClassPathEntriesOnly to set
-	 */
-	public void setIncludeExportedClassPathEntriesOnly(boolean includeExportedClassPathEntriesOnly) {
-		this.includeExportedClassPathEntriesOnly = includeExportedClassPathEntriesOnly;
-	}
-	/**
-	 * @see IJavaSearchScope#includesBinaries()
-	 * @deprecated
-	 */
-	public boolean includesBinaries() {
-		return true;
-	}
-
-	/**
-	 * @see IJavaSearchScope#includesClasspaths()
-	 * @deprecated
-	 */
-	public boolean includesClasspaths() {
-		return true;
-	}
-
-	/**
-	 * @see IJavaSearchScope#setIncludesBinaries(boolean)
-	 * @deprecated
-	 */
-	public void setIncludesBinaries(boolean includesBinaries) {
-		//Default nothing
-	}
-
-	/**
-	 * @see IJavaSearchScope#setIncludesClasspaths(boolean)
-	 * @deprecated
-	 */
-	public void setIncludesClasspaths(boolean includesClasspaths) {
-		//Default nothing
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java
deleted file mode 100644
index 353d443b8..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.util.HashSet;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-public class TypeSearchEngine extends SearchEngine {
-
-	/**
-	 * Constructor for TypeSearchEngine.
-	 */
-	public TypeSearchEngine() {
-		super();
-	}
-
-	/**
-	 * Constructor for TypeSearchEngine.
-	 * 
-	 * @param workingCopies
-	 */
-	public TypeSearchEngine(ICompilationUnit[] workingCopies) {
-		super(workingCopies);
-	}
-
-	/**
-	 * Method createJavaSearchScopeForAProject. Given a project it returns the
-	 * scope of the classes within the project's scope
-	 * 
-	 * @param project
-	 * @param includeReferencedProjects
-	 * @param includeExportedClassPathEntriesOnly
-	 * @return IJavaSearchScope
-	 */
-	public static IJavaSearchScope createJavaSearchScopeForAProject(IJavaProject project, boolean includeReferencedProjects, boolean includeExportedClassPathEntriesOnly) {
-		if (!includeExportedClassPathEntriesOnly) {
-			IJavaElement javaElements[] = new IJavaElement[]{project};
-			return SearchEngine.createJavaSearchScope(javaElements, includeReferencedProjects);
-		}
-		TypeJavaSearchScope scope = new TypeJavaSearchScope();
-		scope.setIncludeExportedClassPathEntriesOnly(true);
-		HashSet visitedProjects = new HashSet(2);
-		try {
-			scope.addProject(project, includeReferencedProjects, visitedProjects);
-		} catch (JavaModelException e) {
-			// ignore
-		}
-		return scope;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java
deleted file mode 100644
index 7b4253487..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-
-public class TypedFileViewerFilter extends org.eclipse.jface.viewers.ViewerFilter {
-	private String[] fAcceptedExtensions;
-	private Hashtable visitedElements;
-	public TypedFileViewerFilter(String[] acceptedExtensions) {
-		fAcceptedExtensions = acceptedExtensions;
-		visitedElements = new Hashtable();
-	}
-	public boolean isFilterProperty(Object element, Object property) {
-		return false;
-	}
-	public boolean isValid(Object element) {
-		if (IFile.class.isInstance(element))
-			return isValidFile((IFile) element);
-		if (IContainer.class.isInstance(element))
-			return isValidContainer((IContainer) element);
-		return false;
-	}
-	/*
-	 * A valid container is one that contains at least one valid member.
-	 */
-	public boolean isValidContainer(IContainer container) {
-		IResource[] members;
-		Object valid = visitedElements.get(container);
-		if (valid != null)
-			return ((Boolean) valid).booleanValue();
-		try {
-			members = container.members();
-			for (int i = 0; i < members.length; i++) {
-				if (isValid(members[i])) {
-					visitedElements.put(container, Boolean.TRUE);
-					return true;
-				}
-			}
-		} catch (CoreException e) {
-			// Do nothing
-		}
-		visitedElements.put(container, Boolean.FALSE);
-		return false;
-	}
-	public boolean isValidFile(IFile file) {
-		String ext = file.getFileExtension();
-		for (int i = 0; i < fAcceptedExtensions.length; i++) {
-			if (fAcceptedExtensions[i].equalsIgnoreCase(ext)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		return isValid(element);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ArchiveEARUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ArchiveEARUIResourceHandler.java
deleted file mode 100644
index 1682ee1a2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ArchiveEARUIResourceHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.ear.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ArchiveEARUIResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("archiveearui");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle = getResourceBundle();
-		}
-
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	public static String getString(String key, Object[] args) {
-
-		try {
-			return MessageFormat.format(getString(key), args);
-		} catch (IllegalArgumentException e) {
-			return getString(key);
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/EARImportListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/EARImportListContentProvider.java
deleted file mode 100644
index 31c247184..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/EARImportListContentProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ear.actions;
-
-
-import org.eclipse.jst.j2ee.internal.wizard.TableObjects;
-
-/**
- * Insert the type's description here. Creation date: (5/7/2001 11:39:11 AM)
- * 
- * @author: Administrator
- */
-public class EARImportListContentProvider implements org.eclipse.jface.viewers.IStructuredContentProvider {
-	/**
-	 * EARImportListContentProvider constructor comment.
-	 */
-	public EARImportListContentProvider() {
-		super();
-	}
-
-	/**
-	 * Disposes of this content provider. This is called by the viewer when it is disposed.
-	 */
-	public void dispose() {
-		//dispose
-	}
-
-	/**
-	 * Returns the elements to display in the viewer when its input is set to the given element.
-	 * These elements can be presented as rows in a table, items in a list, etc. The result is not
-	 * modified by the viewer.
-	 * 
-	 * @param inputElement
-	 *            the input element
-	 * @return the array of elements to display in the viewer
-	 */
-	public java.lang.Object[] getElements(Object inputElement) {
-		if (inputElement instanceof TableObjects)
-			return ((TableObjects) inputElement).getTableObjects().toArray();
-		return new Object[0]; //should throw exception instead
-	}
-
-	/**
-	 * Notifies this content provider that the given viewer's input has been switched to a different
-	 * element.
-	 * <p>
-	 * A typical use for this method is registering the content provider as a listener to changes on
-	 * the new input (using model-specific means), and deregistering the viewer from the old input.
-	 * In response to these change notifications, the content provider propagates the changes to the
-	 * viewer.
-	 * </p>
-	 * 
-	 * @param viewer
-	 *            the viewer
-	 * @param oldInput
-	 *            the old input element, or <code>null</code> if the viewer did not previously
-	 *            have an input
-	 * @param newInput
-	 *            the new input element, or <code>null</code> if the viewer does not have an input
-	 */
-	public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
-		//do nothing
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ExportEARAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ExportEARAction.java
deleted file mode 100644
index a7078ae50..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ExportEARAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ear.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportEARAction extends BaseAction {
-
-	public static String LABEL = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%ear.export.action.description_ui_");//$NON-NLS-1$
-	private static final String ICON = "export_ear_wiz"; //$NON-NLS-1$
-
-	public ExportEARAction() {
-		super();
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	public void primRun(Shell shell) {
-		EARComponentExportWizard wizard = new EARComponentExportWizard();
-		J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
-		wizard.init(plugin.getWorkbench(), selection);
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.open();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ImportEARAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ImportEARAction.java
deleted file mode 100644
index 305c3ec95..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ImportEARAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- * 
- * To change this generated comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ear.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportEARAction extends BaseAction {
-	public static String LABEL = ArchiveEARUIResourceHandler.getString("Import_EAR"); //$NON-NLS-1$
-	private static final String ICON = "import_ear_wiz"; //$NON-NLS-1$
-
-	public ImportEARAction() {
-		super();
-		setText(LABEL);
-		setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
-	}
-
-	protected void primRun(Shell shell) {
-
-		EARComponentImportWizard wizard = new EARComponentImportWizard();
-
-		J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
-		wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.open();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java
deleted file mode 100644
index 4914e7f12..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ear.actions;
-
-
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-
-/**
- * Insert the type's description here. Creation date: (8/22/2001 2:27:24 PM)
- * 
- * @author: Administrator
- */
-public class ModulesProvider implements org.eclipse.jface.viewers.ILabelProvider, org.eclipse.jface.viewers.IStructuredContentProvider {
-	/**
-	 * ModulesProvider constructor comment.
-	 */
-	public ModulesProvider() {
-		super();
-	}
-
-	/**
-	 * Adds a listener to this label provider. Has no effect if an identical listener is already
-	 * registered.
-	 * <p>
-	 * Label provider listeners are informed about state changes that affect the rendering of the
-	 * viewer that uses this label provider.
-	 * </p>
-	 * 
-	 * @param listener
-	 *            a label provider listener
-	 */
-	public void addListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
-		//do nothing
-	}
-
-	/**
-	 * Disposes of this content provider. This is called by the viewer when it is disposed.
-	 */
-	public void dispose() {
-		//dispose
-	}
-
-	/**
-	 * Returns the elements to display in the viewer when its input is set to the given element.
-	 * These elements can be presented as rows in a table, items in a list, etc. The result is not
-	 * modified by the viewer.
-	 * 
-	 * @param inputElement
-	 *            the input element
-	 * @return the array of elements to display in the viewer
-	 */
-	public java.lang.Object[] getElements(java.lang.Object inputElement) {
-		return ((java.util.List) inputElement).toArray();
-	}
-
-	/**
-	 * Returns the image for the label of the given element. The image is owned by the label
-	 * provider and must not be disposed directly. Instead, dispose the label provider when no
-	 * longer needed.
-	 * 
-	 * @param element
-	 *            the element for which to provide the label image
-	 * @return the image used to label the element, or <code>null</code> if these is no image for
-	 *         the given object
-	 */
-	public org.eclipse.swt.graphics.Image getImage(Object element) {
-		return null;
-	}
-
-	/**
-	 * Returns the text for the label of the given element.
-	 * 
-	 * @param element
-	 *            the element for which to provide the label text
-	 * @return the text string used to label the element, or <code>null</code> if these is no text
-	 *         label for the given object
-	 */
-	public String getText(Object element) {
-		return ((ClassPathSelection) element).getText();
-	}
-
-	/**
-	 * Notifies this content provider that the given viewer's input has been switched to a different
-	 * element.
-	 * <p>
-	 * A typical use for this method is registering the content provider as a listener to changes on
-	 * the new input (using model-specific means), and deregistering the viewer from the old input.
-	 * In response to these change notifications, the content provider propagates the changes to the
-	 * viewer.
-	 * </p>
-	 * 
-	 * @param viewer
-	 *            the viewer
-	 * @param oldInput
-	 *            the old input element, or <code>null</code> if the viewer did not previously
-	 *            have an input
-	 * @param newInput
-	 *            the new input element, or <code>null</code> if the viewer does not have an input
-	 */
-	public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
-		//do nothing
-	}
-
-	/**
-	 * Returns whether the label would be affected by a change to the given property of the given
-	 * element. This can be used to optimize a non-structural viewer update. If the property
-	 * mentioned in the update does not affect the label, then the viewer need not update the label.
-	 * 
-	 * @param element
-	 *            the element
-	 * @param property
-	 *            the property
-	 * @return <code>true</code> if the label would be affected, and <code>false</code> if it
-	 *         would be unaffected
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/**
-	 * Removes a listener to this label provider. Has no affect if an identical listener is not
-	 * registered.
-	 * 
-	 * @param listener
-	 *            a label provider listener
-	 */
-	public void removeListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
-		//do nothing
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java
deleted file mode 100644
index 1eccf4525..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.common.frameworks.internal.ui.DisplayUtility;
-
-
-public abstract class AbstractMethodsContentProvider extends AdapterFactoryContentProvider {
-	protected static EStructuralFeature ME_EJB_SF = EjbFactoryImpl.getPackage().getMethodElement_EnterpriseBean();
-	protected static EStructuralFeature JAR_ASSEMBLY_SF = EjbFactoryImpl.getPackage().getEJBJar_AssemblyDescriptor();
-	private static final EStructuralFeature ECORE_BEAN_NAME = EcorePackage.eINSTANCE.getENamedElement_Name(); //ENAMED_ELEMENT__NAME
-	protected Comparator meComparator;
-	protected boolean isRoot = true;
-
-	public class EJBMethodItem {
-		public EObject refObject;
-		public EnterpriseBean ejb;
-
-		public EJBMethodItem(EObject aRefObject, EnterpriseBean anEJB) {
-			refObject = aRefObject;
-			ejb = anEJB;
-		}
-
-	}
-
-	/**
-	 * Constructor for AbstractMethodsContentProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public AbstractMethodsContentProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public AbstractMethodsContentProvider(AdapterFactory adapterFactory, boolean root) {
-		super(adapterFactory);
-		isRoot = root;
-	}
-
-	protected Comparator getEnterpriseBeanComparator() {
-		return EJBNameComparator.singleton();
-	}
-
-	protected Comparator getMethodElementComparator() {
-		if (meComparator == null)
-			meComparator = new EjbMethodElementComparator();
-		return meComparator;
-	}
-
-	/*
-	 * @see ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof AbstractMethodsContentProvider.EJBMethodItem)
-			return getMethodElements((AbstractMethodsContentProvider.EJBMethodItem) parentElement);
-		return new Object[0];
-	}
-
-	protected Object[] getMethodElements(AbstractMethodsContentProvider.EJBMethodItem ejbItem) {
-		EObject refObject = ejbItem.refObject;
-		if (refObject == null)
-			return new Object[0];
-		List elements = getMethodElements(refObject, ejbItem.ejb);
-		Object[] result = elements.toArray();
-		if (result.length == 1)
-			return result;
-		Arrays.sort(result, getMethodElementComparator());
-		return result;
-	}
-
-	protected abstract List getMethodElements(EObject aRefObject, EnterpriseBean anEJB);
-
-	protected Object[] getEnterpriseBeans(EObject parentElement, List someMethodElements) {
-		if (someMethodElements.isEmpty())
-			return new Object[0];
-		Set ejbs = new HashSet();
-		EnterpriseBean ejb = null;
-		MethodElement me = null;
-		for (int i = 0; i < someMethodElements.size(); i++) {
-			me = (MethodElement) someMethodElements.get(i);
-			ejb = me.getEnterpriseBean();
-			if (ejb != null)
-				ejbs.add(ejb);
-		}
-		Object[] result = ejbs.toArray();
-		if (result.length != 1)
-			Arrays.sort(result, getEnterpriseBeanComparator());
-		ejb = null;
-		for (int i = 0; i < result.length; i++) {
-			ejb = (EnterpriseBean) result[i];
-			result[i] = new EJBMethodItem(parentElement, ejb);
-		}
-		return result;
-	}
-
-	protected AssemblyDescriptor getAssemblyDescriptor(EnterpriseBean ejb) {
-		if (ejb == null)
-			return null;
-		return ejb.getEjbJar().getAssemblyDescriptor();
-	}
-
-	/*
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof AbstractMethodsContentProvider.EJBMethodItem)
-			return true;
-		return false;
-	}
-
-	protected TreeViewer getTreeViewer() {
-		return (TreeViewer) viewer;
-	}
-
-	protected void refreshTreeViewer(Object obj) {
-		if (viewer != null)
-			DisplayUtility.asyncExec(createRefreshTreeRunnable(obj));
-	}
-
-	protected void refreshTreeViewer() {
-		if (viewer != null)
-			DisplayUtility.asyncExec(createRefreshTreeRunnable(null));
-	}
-
-	protected void refreshTreeViewer(MethodElement me) {
-		refreshTreeViewer(me.eContainer());
-	}
-
-	protected void refreshTreeViewer(List aList) {
-		if (aList.isEmpty())
-			return;
-		refreshTreeViewer((MethodElement) aList.get(0));
-	}
-
-	protected void addToTreeViewer(final MethodElement me) {
-		if (viewer == null)
-			return;
-		DisplayUtility.asyncExec(new Runnable() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				// findMethodItem() should be run in a Display thread
-				EJBMethodItem item = findMethodItem(me);
-				if (item != null)
-					DisplayUtility.asyncExec(createAddItemTreeRunnable(item, me));
-				else
-					refreshTreeViewer(me.eContainer());
-
-			}
-		});
-	}
-
-	protected void removeFromTreeViewer(final EObject parent, final MethodElement me) {
-		if (viewer == null)
-			return;
-		DisplayUtility.asyncExec(new Runnable() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				EnterpriseBean ejb = me.getEnterpriseBean();
-				EJBMethodItem item = findMethodItem(ejb, parent);
-				if (item != null)
-					refreshTreeViewer(item);
-				else
-					refreshTreeViewer((Object) null);
-			}
-		});
-	}
-
-	protected EJBMethodItem findMethodItem(MethodElement me) {
-		return findMethodItem(me.getEnterpriseBean(), me.eContainer());
-	}
-
-	protected EJBMethodItem findMethodItem(EnterpriseBean ejb, EObject parentMethod) {
-		TreeItem[] items = getTreeViewer().getTree().getItems();
-		return findMethodItem(ejb, parentMethod, items);
-	}
-
-	protected EJBMethodItem findMethodItem(EnterpriseBean ejb, EObject parentMethod, TreeItem[] items) {
-		TreeItem item = null;
-		Object data = null;
-		EJBMethodItem methodItem = null, found = null;
-		for (int i = 0; i < items.length; i++) {
-			item = items[i];
-			data = item.getData();
-			if (data instanceof EJBMethodItem) {
-				methodItem = (EJBMethodItem) data;
-				if (methodItem.ejb == ejb && methodItem.refObject == parentMethod)
-					return methodItem;
-			}
-			found = findMethodItem(ejb, parentMethod, item.getItems());
-			if (found != null)
-				return found;
-		}
-		return null;
-	}
-
-	/*
-	 * @see INotifyChangedListener#notifyChanged(new ENotificationImpl((InternalEObject)Object,
-	 *      int,(EStructuralFeature) Object, Object, Object, int))
-	 */
-	public void notifyChanged(Notification notifier) {
-		if (notifier.getEventType() == Notification.RESOLVE)
-			return;
-		else if (notifier.getOldValue() instanceof CMPAttribute && notifier.getNewValue() == null)
-			return;
-		else if (notifier.getFeature() == ME_EJB_SF) {
-			refreshTreeViewer((MethodElement) notifier.getNotifier());
-			return;
-		} else if (notifier.getFeature() == ECORE_BEAN_NAME) {
-			refreshTreeViewer();
-			return;
-		} else if (getMethodElementsReference() == notifier.getFeature()) {
-			if (notifier.getEventType() == Notification.ADD)
-				addToTreeViewer((MethodElement) notifier.getNewValue());
-			else if (notifier.getEventType() == Notification.REMOVE)
-				removeFromTreeViewer((EObject) notifier.getNotifier(), (MethodElement) notifier.getOldValue());
-			return;
-		} else if (notifier.getFeature() == JAR_ASSEMBLY_SF && isRoot) {
-			updateTreeInput(notifier.getNewValue());
-		} else if (notifier.getFeature() == getMethodElementsContainerReference())
-			super.notifyChanged(notifier);
-	}
-
-	/**
-	 * @param notifier
-	 */
-	protected void updateTreeInput(final Object target) {
-		DisplayUtility.asyncExec(new Runnable() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-
-				getTreeViewer().setInput(target); //reset the input
-				getTreeViewer().refresh(target);
-
-			}
-		});
-	}
-
-	private Runnable createAddItemTreeRunnable(final Object parent, final MethodElement me) {
-		return new Runnable() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				getTreeViewer().add(parent, me);
-			}
-		};
-	}
-
-	private Runnable createRefreshTreeRunnable(final Object target) {
-		return new Runnable() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				if (target != null)
-					getTreeViewer().refresh(target);
-				else
-					getTreeViewer().refresh();
-			}
-		};
-	}
-
-	protected abstract EStructuralFeature getMethodElementsReference();
-
-	protected abstract EStructuralFeature getMethodElementsContainerReference();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java
deleted file mode 100644
index 38a42ebce..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:29:49 AM)
- * 
- * @author: Administrator
- */
-public class BeanClassProviderHelper extends J2EEJavaClassProviderHelper {
-	private static Image image;
-
-	/**
-	 * BeanClassProviderHelper constructor comment.
-	 */
-	public BeanClassProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:53:09 PM)
-	 * 
-	 * @return org.eclipse.jem.internal.java.JavaClass
-	 */
-	public JavaClass getJavaClass() {
-		return getEjb().getEjbClass();
-	}
-
-	protected String getOverlayKey() {
-		return "ejb_module_ovr";//$NON-NLS-1$
-	}
-
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("EJB_Class_UI_", new Object[]{className}); //$NON-NLS-1$ = "EJB Class"
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java
deleted file mode 100644
index d03ed28bf..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class EJBUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "j2ee_ejb_ui";//$NON-NLS-1$
-
-	private EJBUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String GroupedEJBJarItemProvider_UI_0;
-	public static String GroupedEJBJarItemProvider_UI_1;
-	public static String GroupedEJBJarItemProvider_UI_2;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, EJBUIMessages.class);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java
deleted file mode 100644
index 12c91ca8d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class ExcludeListContentProvider extends AbstractMethodsContentProvider {
-	private static final EStructuralFeature EXCLUDE_ME_SF = EjbFactoryImpl.getPackage().getExcludeList_MethodElements();
-	private static final EStructuralFeature AD_EL_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_ExcludeList();
-	protected static final EStructuralFeature ECORE_BEAN_NAME = EcorePackage.eINSTANCE.getENamedElement_Name(); //ENAMED_ELEMENT__NAME
-
-	/**
-	 * Constructor for ExcludeListContentProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param root
-	 * @param viewer
-	 */
-	public ExcludeListContentProvider(AdapterFactory adapterFactory, boolean root) {
-		super(adapterFactory, root);
-	}
-
-	/**
-	 * Constructor for ExcludesListContentProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public ExcludeListContentProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	protected Object[] getEnterpriseBeans(ExcludeList list) {
-		List mes = list.getMethodElements();
-		return getEnterpriseBeans(list, mes);
-	}
-
-	/*
-	 * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
-	 */
-	protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
-		if (!(aRefObject instanceof ExcludeList))
-			return Collections.EMPTY_LIST;
-		ExcludeList parentList = (ExcludeList) aRefObject;
-		if (parentList == null)
-			return Collections.EMPTY_LIST;
-		return parentList.getMethodElements(anEJB);
-	}
-
-	/*
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		super.getElements(inputElement);
-		ExcludeList list = null;
-		if (inputElement instanceof EJBJar) {
-			EJBJar jar = (EJBJar) inputElement;
-			if (jar.getAssemblyDescriptor() != null)
-				list = jar.getAssemblyDescriptor().getExcludeList();
-			if (list != null)
-				return getEnterpriseBeans(list);
-		}
-		if (inputElement instanceof AssemblyDescriptor) {
-			list = ((AssemblyDescriptor) inputElement).getExcludeList();
-			if (list != null)
-				return getEnterpriseBeans(list);
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof ExcludeList)
-			return getEnterpriseBeans((ExcludeList) parentElement);
-		return super.getChildren(parentElement);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof ExcludeList)
-			return !((ExcludeList) element).getMethodElements().isEmpty();
-		return super.hasChildren(element);
-	}
-
-	public void notifyChanged(Notification notifier) {
-		if ((notifier.getFeature() == EXCLUDE_ME_SF && notifier.getNotifier() instanceof ExcludeList) || notifier.getFeature() == ECORE_BEAN_NAME) {
-			if (notifier.getEventType() == Notification.RESOLVE)
-				return;
-			if (isRoot)
-				refreshTreeViewer();
-			else
-				refreshTreeViewer(notifier.getNotifier());
-		}
-		if (notifier.getOldValue() instanceof CMPAttribute && notifier.getNewValue() == null)
-			return;
-		if (notifier.getFeature() == getMethodElementsReference() || notifier.getFeature() == getMethodElementsContainerReference())
-			super.notifyChanged(notifier);
-	}
-
-	/*
-	 * @see AbstractMethodsContentProvider#getMethodElementsReference()
-	 */
-	protected EStructuralFeature getMethodElementsReference() {
-		return EXCLUDE_ME_SF;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
-	 */
-	protected EStructuralFeature getMethodElementsContainerReference() {
-		return AD_EL_SF;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java
deleted file mode 100644
index 6645c6f34..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-
-
-
-/**
- * This class is the item provider for EJB groups
- */
-public abstract class GroupedEJBItemProvider extends J2EEItemProvider {
-
-	public GroupedEJBItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
-		super(adapterFactory, text, image, parent, children);
-	}
-	
-	public IFile getAssociatedFile() {
-
-		try {
-			EJBJar ejbJar = (EJBJar) getParent();
-			if(ejbJar != null && ejbJar.eResource() != null) {
-				return WorkbenchResourceHelperBase.getIFile(ejbJar.eResource().getURI());
-			}
-		} catch (Throwable t) {
-			
-		}
-		return null;		
-	}
-
-	public abstract String getText(Object object);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java
deleted file mode 100644
index 5efe5cb94..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.internal.ejb.provider;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-
-
-/**
- * @author Sachin P Patel
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedEJBJarItemProvider extends EJBJarItemProvider {
-
-	private GroupedSessionItemProvider sessionProvider = null;
-	private GroupedEntityItemProvider entityProvider = null;
-	private GroupedMessageItemProvider messageProvider = null;
-
-	private static Hashtable sessionTable = new Hashtable();
-	private static Hashtable entityTable = new Hashtable();
-	private static Hashtable messageTable = new Hashtable();
-
-	private static final String SESSION = EJBUIMessages.GroupedEJBJarItemProvider_UI_0;
-	private static final String ENTITY = EJBUIMessages.GroupedEJBJarItemProvider_UI_1;
-	private static final String MESSAGE = EJBUIMessages.GroupedEJBJarItemProvider_UI_2;
-
-	//	Normally there is one instance of an item provider for all instances of the objecct
-	//	in the tree. The item provider would be stateless. However, because we are doing tricks
-	//	here, we are keeping track of all items this provider manages. The key in the map is the
-	//	object (EJBJar), and the value is the children nodes that we inserted
-
-	protected Map children = new HashMap();
-	private boolean showAssemblyDescriptor;
-	private boolean isDisposing;
-
-	public GroupedEJBJarItemProvider(AdapterFactory adapterFactory, boolean showAssemblyDescriptor) {
-		super(adapterFactory);
-		this.showAssemblyDescriptor = showAssemblyDescriptor;
-	}
-
-	public Collection getChildren(Object object) {
-		List result = initChildren(object);
-		if (showAssemblyDescriptor) {
-			if (((EJBJar) object).getAssemblyDescriptor() != null)
-				result.add(((EJBJar) object).getAssemblyDescriptor());
-		}
-		return result;
-	}
-
-	protected List initChildren(Object object) {
-		EJBJar ejbJar = (EJBJar) object;
-		List allRootBeans = getAllRootBeans(ejbJar);
-
-		boolean is20Jar = is20Jar(ejbJar);
-
-		List localChildren = new ArrayList(5);
-
-		List entityBeans = new ArrayList();
-		List sessionBeans = new ArrayList();
-		List messageBeans = new ArrayList();
-
-		catagorizeBeans(allRootBeans, entityBeans, sessionBeans, messageBeans);
-		orderBeans(entityBeans);
-		orderBeans(sessionBeans);
-		orderBeans(messageBeans);
-		
-		//ENABLE FOR: NOT TO SHOW EMPTY GROUPS
-		//if (sessionBeans.size() > 0) {
-		if (sessionTable.get(ejbJar) == null) {
-			//create new item provider instance
-			sessionProvider = new GroupedSessionItemProvider(adapterFactory, null, getImage(SESSION), object, sessionBeans);
-			sessionTable.put(ejbJar, sessionProvider);
-			localChildren.add(sessionProvider);
-		} else {
-			//use existing instance from table
-			localChildren.add(sessionTable.get(ejbJar));
-		}
-		//}
-
-		//ENABLE FOR: NOT TO SHOW EMPTY GROUPS
-		//if (entityBeans.size() > 0) {
-		if (entityTable.get(ejbJar) == null) {
-			//create new item provider instance
-			entityProvider = new GroupedEntityItemProvider(adapterFactory, null, getImage(ENTITY), object, entityBeans);
-			entityTable.put(ejbJar, entityProvider);
-			localChildren.add(entityProvider);
-		} else {
-			//use existing instance from table
-			localChildren.add(entityTable.get(ejbJar));
-		}
-		//}
-
-		//ENABLE FOR: NOT TO SHOW EMPTY GROUPS
-		//if (is20Jar && messageBeans.size() > 0) {
-		if (is20Jar) {
-			if (messageTable.get(ejbJar) == null) {
-				//create new item provider instance
-				messageProvider = new GroupedMessageItemProvider(adapterFactory, null, getImage(MESSAGE), object, messageBeans);
-				messageTable.put(ejbJar, messageProvider);
-				localChildren.add(messageProvider);
-			} else {
-				//use existing instance from table
-				localChildren.add(messageTable.get(ejbJar));
-			}
-		}
-		//}
-
-		children.put(object, localChildren);
-
-		return localChildren;
-	}
-
-	protected void orderBeans(List beans) {
-		Object[] beansArray = beans.toArray();
-		Arrays.sort(beansArray, EJBNameComparator.singleton());
-		beans.clear();
-		beans.addAll(Arrays.asList(beansArray));
-	}
-	
-	protected static List getAllRootBeans(EJBJar ejbJar) {
-		return ejbJar.getEnterpriseBeans();
-	}
-
-	protected void catagorizeBeans(List allRootBeans, List entityBeans, List sessionBeans, List messageBeans) {
-		for (int i = 0; i < allRootBeans.size(); i++) {
-			if (((EnterpriseBean) allRootBeans.get(i)).isSession()) {
-				sessionBeans.add(allRootBeans.get(i));
-			} else if (((EnterpriseBean) allRootBeans.get(i)).isEntity()) {
-				entityBeans.add(allRootBeans.get(i));
-			} else if (((EnterpriseBean) allRootBeans.get(i)).isMessageDriven()) {
-				messageBeans.add(allRootBeans.get(i));
-			}
-		}
-	}
-
-	static protected GroupedSessionItemProvider getSessionNode(Object object) {
-		return (GroupedSessionItemProvider) sessionTable.get(object);
-	}
-
-	static protected GroupedEntityItemProvider getEntityNode(Object object) {
-		return (GroupedEntityItemProvider) entityTable.get(object);
-	}
-
-	static protected GroupedMessageItemProvider getMessageNode(Object object) {
-		return (GroupedMessageItemProvider) messageTable.get(object);
-	}
-
-	public Object getImage(String type) {
-		if (type.equals(SESSION))
-			return J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
-		else if (type.equals(MESSAGE))
-			return J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
-		else if (type.equals(ENTITY))
-			return J2EEPlugin.getPlugin().getImage("entitybean_obj"); //$NON-NLS-1$
-		else
-			return null;
-	}
-
-	private boolean is20Jar(EJBJar ejbJar) {
-		switch (ejbJar.getVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID :
-			case J2EEVersionConstants.EJB_1_1_ID :
-				return false;
-			case J2EEVersionConstants.EJB_2_0_ID :
-			case J2EEVersionConstants.EJB_2_1_ID :
-			default :
-				return true;
-		}
-	}
-
-	public void notifyChanged(Notification notification) {
-		if (notification.getEventType() == Notification.REMOVING_ADAPTER && notification.getOldValue() == this && !isDisposing) {
-			removeTarget(notification);
-			return;
-		}
-		if (notification.getFeature() == EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans()) {
-			J2EEItemProvider provider = beansChanged((EJBJar) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
-
-			//EJB's group has not been added yet, need to add group to tree before EJB can be added
-			if (provider == null) {
-				Notification msg = new NotificationImpl(Notification.ADD, null, getEJBItemProvider((EnterpriseBean) notification.getNewValue()), 1);
-				NotificationWrapper notificationWrapper = new NotificationWrapper(notification.getNotifier(), msg);
-				fireNotifyChanged(notificationWrapper);
-				provider = beansChanged((EJBJar) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
-			}
-
-			//Fire notification for EJB add or remove
-			NotificationWrapper notificationWrapper = new NotificationWrapper(provider, notification);
-			fireNotifyChanged(notificationWrapper);
-
-			//ENABLE FOR: NOT TO SHOW EMPTY GROUPS
-			//If Group is empty remove the group
-			/*
-			 * if (provider != null && provider.getChildren().size() == 0) { Notification msg = new
-			 * NotificationImpl(Notification.REMOVE, provider, null, 1); notificationWrapper = new
-			 * NotificationWrapper(notification.getNotifier(), msg);
-			 * fireNotifyChanged(notificationWrapper);
-			 * 
-			 * //Group is removed so flush out table entry if (provider instanceof
-			 * GroupedSessionItemProvider) { sessionTable.remove(notification.getNotifier());
-			 * provider = null; } else if (provider instanceof GroupedEntityItemProvider) {
-			 * entityTable.remove(notification.getNotifier()); provider = null; } else if (provider
-			 * instanceof GroupedMessageItemProvider) {
-			 * messageTable.remove(notification.getNotifier()); provider = null; }
-			 * 
-			 * //If all groups are removed remove the extended children List allChildren = new
-			 * ArrayList(this.getChildren((EJBJar) notification.getNotifier()));
-			 * if(sessionTable.get(notification.getNotifier()) == null &&
-			 * entityTable.get(notification.getNotifier()) == null &&
-			 * messageTable.get(notification.getNotifier()) == null) { for(int i = 0; i <
-			 * allChildren.size(); i++) { Notification message = new
-			 * NotificationImpl(Notification.REMOVE, allChildren.get(i), null, 1);
-			 * notificationWrapper = new NotificationWrapper(notification.getNotifier(), message);
-			 * fireNotifyChanged(notificationWrapper); } this.getChildren((EJBJar)
-			 * notification.getNotifier()).clear(); } }
-			 */
-		} else {
-			super.notifyChanged(notification);
-		}
-	}
-
-	protected J2EEItemProvider beansChanged(EJBJar ejbJar, int eventType, Object oldValue, Object newValue, int pos) {
-		J2EEItemProvider provider = getItemProvider(ejbJar, oldValue, newValue);
-
-		if (provider != null) {
-			Collection grandChildren = provider.getChildren();
-
-			switch (eventType) {
-				case Notification.ADD : {
-					if (!grandChildren.contains(newValue))
-						grandChildren.add(newValue);
-
-					break;
-				}
-				case Notification.ADD_MANY : {
-					grandChildren.addAll((Collection) newValue);
-					break;
-				}
-				case Notification.REMOVE : {
-					grandChildren.remove(oldValue);
-					break;
-				}
-				case Notification.REMOVE_MANY : {
-					grandChildren.removeAll((Collection) oldValue);
-					break;
-				}
-			}
-		} else {
-			//GroupedProvider for new bean does not exist, create one.
-			List allRootBeans = getAllRootBeans(ejbJar);
-
-			List entityBeans = new ArrayList();
-			List sessionBeans = new ArrayList();
-			List messageBeans = new ArrayList();
-
-			catagorizeBeans(allRootBeans, entityBeans, sessionBeans, messageBeans);
-
-			if (newValue instanceof Session) {
-				sessionProvider = new GroupedSessionItemProvider(adapterFactory, null, getImage(SESSION), ejbJar, sessionBeans);
-				sessionTable.put(ejbJar, sessionProvider);
-			} else if (newValue instanceof Entity) {
-				entityProvider = new GroupedEntityItemProvider(adapterFactory, null, getImage(ENTITY), ejbJar, entityBeans);
-				entityTable.put(ejbJar, entityProvider);
-			} else if (newValue instanceof MessageDriven) {
-				messageProvider = new GroupedMessageItemProvider(adapterFactory, null, getImage(MESSAGE), ejbJar, messageBeans);
-				messageTable.put(ejbJar, messageProvider);
-			}
-		}
-		return provider;
-	}
-
-	static public J2EEItemProvider getEJBJarItemProvider(EJBJar ejbJar, Object bean) {
-		J2EEItemProvider provider = null;
-		if (ejbJar != null && bean != null) {
-			if (bean instanceof Session) {
-				provider = getSessionNode(ejbJar);
-			} else if (bean instanceof Entity) {
-				provider = getEntityNode(ejbJar);
-			} else if (bean instanceof MessageDriven) {
-				provider = getMessageNode(ejbJar);
-			}
-		}
-		return provider;
-	}
-
-	static public J2EEItemProvider getEJBItemProvider(EnterpriseBean bean) {
-		if (bean != null) {
-			EJBJar ejbJar = bean.getEjbJar();
-			return getEJBJarItemProvider(ejbJar, bean);
-		}
-		return null;
-	}
-
-	protected J2EEItemProvider getItemProvider(EJBJar ejbJar, Object oldValue, Object newValue) {
-		if (newValue != null)
-			return getEJBJarItemProvider(ejbJar, newValue);
-		else if (oldValue != null)
-			return getEJBJarItemProvider(ejbJar, oldValue);
-		else
-			return null;
-	}
-
-	public static boolean isRootBean(EnterpriseBean bean) {
-		List allRootBeans = getAllRootBeans(bean.getEjbJar());
-		if (allRootBeans != null && allRootBeans.contains(bean)) {
-			return true;
-		}
-		return false;
-	}
-
-	//	Utility method for garbage collection - if EJBJar removed, remove
-	//	all entires in table for EJBJar
-	static public void flushOutTableEntriesForEJBJar(EJBJar ejbJar) {
-		sessionTable.remove(ejbJar);
-		entityTable.remove(ejbJar);
-		messageTable.remove(ejbJar);
-	}
-
-	public boolean hasChildren(Object parent) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.internal.ejb.provider.EJBJarItemProvider#removeTarget(org.eclipse.emf.common.notify.Notification)
-	 */
-	protected void removeTarget(Notification not) {
-		if (not.getNotifier() instanceof EJBJar)
-			flushOutTableEntriesForEJBJar((EJBJar) not.getNotifier());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
-	 */
-	public void dispose() {
-		try {
-			isDisposing = true;
-			super.dispose();
-		} finally {
-			isDisposing = false;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java
deleted file mode 100644
index 0dbb40b2d..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-/**
- * @author Sachin Patel
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedEntityItemProvider extends GroupedEJBItemProvider {
-
-	public static final String ENTITY = J2EEUIMessages.getResourceString("Entity_UI_"); //$NON-NLS-1$
-
-	public GroupedEntityItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
-		super(adapterFactory, text, image, parent, children);
-	}
-
-	public String getText(Object object) {
-		return ENTITY;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java
deleted file mode 100644
index 6c977b2d2..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-
-/**
- * @author Sachin Patel
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedMessageItemProvider extends GroupedEJBItemProvider {
-
-	public static final String MESSAGE_BEANS = J2EEUIMessages.getResourceString("Message_Driven_Beans_UI_"); //$NON-NLS-1$
-
-	public GroupedMessageItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
-		super(adapterFactory, text, image, parent, children);
-	}
-
-	public String getText(Object object) {
-		return MESSAGE_BEANS;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java
deleted file mode 100644
index 15c28172c..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-/**
- * @author Sachin Patel
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedSessionItemProvider extends GroupedEJBItemProvider {
-
-	public static final String SESSION_BEANS = J2EEUIMessages.getResourceString("Session_Beans_UI_"); //$NON-NLS-1$
-
-	public GroupedSessionItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
-		super(adapterFactory, text, image, parent, children);
-	}
-
-	public String getText(Object object) {
-		return SESSION_BEANS;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java
deleted file mode 100644
index 6c37abe75..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:23:30 PM)
- * 
- * @author: Administrator
- */
-public class HomeInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-	private static Image image;
-
-	/**
-	 * HomeInterfaceProviderHelper constructor comment.
-	 * 
-	 * @param cls
-	 *            org.eclipse.jem.internal.java.JavaClass
-	 */
-	public HomeInterfaceProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:53:49 PM)
-	 * 
-	 * @return org.eclipse.jem.internal.java.JavaClass
-	 */
-	public JavaClass getJavaClass() {
-		return getEjb().getHomeInterface();
-	}
-
-	protected String getOverlayKey() {
-		return "home_interface_overlay_obj";//$NON-NLS-1$
-	}
-
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("Home_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Home Interface"
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java
deleted file mode 100644
index ec5f13c6b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 6:58:51 PM)
- * 
- * @author: Administrator
- */
-public class J2EEContainerManagedEntityItemProvider extends ContainerManagedEntityItemProvider {
-	/**
-	 * J2EEContainerManagedEntityItemProvider constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 */
-	public J2EEContainerManagedEntityItemProvider(EjbItemProviderAdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		result.addAll(super.getChildren(object));
-		J2EEJavaClassProviderHelper.addChildren((ContainerManagedEntity) object, result);
-		result.addAll(((ContainerManagedEntity) object).getEnvironmentProperties());
-		result.addAll(J2EEReferenceProviderHelper.getReferences((EnterpriseBean) object));
-		return result;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
deleted file mode 100644
index f888d86cc..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 7:20:07 PM)
- * 
- * @author: Administrator
- */
-public class J2EEEjbItemProviderAdapterFactory extends org.eclipse.jst.j2ee.internal.ejb.provider.EjbItemProviderAdapterFactory {
-	/**
-	 * J2EEEjbItemProviderAdapterFactory constructor comment.
-	 */
-	public J2EEEjbItemProviderAdapterFactory() {
-		super();
-	}
-
-	/**
-	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}.
-	 */
-	public Adapter createContainerManagedEntityAdapter() {
-		if (containerManagedEntityItemProvider == null) {
-			containerManagedEntityItemProvider = new J2EEContainerManagedEntityItemProvider(this);
-		}
-
-		return containerManagedEntityItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}.
-	 */
-	public Adapter createEJBJarAdapter() {
-		if (eJBJarItemProvider == null) {
-			eJBJarItemProvider = new GroupedEJBJarItemProvider(this, true);
-		}
-
-		return eJBJarItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Entity}.
-	 */
-	public Adapter createEntityAdapter() {
-		if (entityItemProvider == null) {
-			entityItemProvider = new J2EEEntityItemProvider(this);
-		}
-
-		return entityItemProvider;
-	}
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Session}.
-	 */
-	public Adapter createSessionAdapter() {
-		if (sessionItemProvider == null) {
-			sessionItemProvider = new J2EESessionItemProvider(this);
-		}
-
-		return sessionItemProvider;
-	}
-
-	public Adapter createMessageDrivenAdapter() {
-		if (messageDrivenItemProvider == null) {
-			messageDrivenItemProvider = new J2EEMessageDrivenItemProvider(this);
-		}
-		return messageDrivenItemProvider;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java
deleted file mode 100644
index 037d4d67e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.Entity;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:10:06 PM)
- * 
- * @author: Administrator
- */
-public class J2EEEntityItemProvider extends EntityItemProvider {
-	/**
-	 * J2EEEntityItemProvider constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 */
-	public J2EEEntityItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		result.addAll(super.getChildrenSuper(object));
-		J2EEJavaClassProviderHelper.addChildren((Entity) object, result);
-		return result;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
deleted file mode 100644
index 00fe427db..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon;
-
-public abstract class J2EEJavaClassProviderHelper implements IAdaptable {
-	private EnterpriseBean ejb;
-	public static final Class IRESOURCE_CLASS = IResource.class;
-	public static final Class IPROJECT_CLASS = IProject.class;
-
-	/**
-	 * J2EEJavaClassProviderHelper constructor comment.
-	 */
-	public J2EEJavaClassProviderHelper(EnterpriseBean anEJB) {
-		super();
-		setEjb(anEJB);
-	}
-
-	public static void addChildren(Entity ejb, Collection children) {
-		addChildren((EnterpriseBean) ejb, children);
-		if (ejb.getPrimaryKey() != null)
-			children.add(new PrimaryKeyClassProviderHelper(ejb));
-	}
-
-	public static void addChildren(EnterpriseBean ejb, Collection children) {
-
-		if (ejb.getHomeInterface() != null)
-			children.add(new HomeInterfaceProviderHelper(ejb));
-		if (ejb.getRemoteInterface() != null)
-			children.add(new RemoteInterfaceProviderHelper(ejb));
-		if (ejb.getLocalHomeInterface() != null)
-			children.add(new LocalHomeInterfaceProviderHelper(ejb));
-		if (ejb.getLocalInterface() != null)
-			children.add(new LocalInterfaceProviderHelper(ejb));
-		if (ejb.getEjbClass() != null)
-			children.add(new BeanClassProviderHelper(ejb));
-	}
-
-	protected Image createImage() {
-		ImageDescriptor base = J2EEUIPlugin.getDefault().getImageDescriptor("jcu_obj");//$NON-NLS-1$
-		if (base == null)
-			return null;
-		ImageDescriptor overlay = getOverlayDescriptor();
-		if (overlay == null)
-			return base.createImage();
-		return new OverlayIcon(base, new ImageDescriptor[][]{{overlay}}).createImage();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:47:24 PM)
-	 * 
-	 * @return org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean
-	 */
-	public org.eclipse.jst.j2ee.ejb.EnterpriseBean getEjb() {
-		return ejb;
-	}
-
-	public Image getImage() {
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (6/20/2001 10:30:54 PM)
-	 * 
-	 * @return JavaClass
-	 */
-	public abstract JavaClass getJavaClass();
-
-	protected ImageDescriptor getOverlayDescriptor() {
-		return J2EEUIPlugin.getDefault().getImageDescriptor(getOverlayKey());
-	}
-
-	protected abstract String getOverlayKey();
-
-	protected IProject getProject() {
-		return ProjectUtilities.getProject(getJavaClass());
-	}
-
-	public String getStatusLineMessage() {
-		if (getJavaClass() != null)
-			return getTypeString(getJavaClass().getQualifiedName());
-		return ""; //$NON-NLS-1$
-	}
-
-	public String getText() {
-		if (getJavaClass() != null)
-			return getJavaClass().getName();
-		return ""; //$NON-NLS-1$
-	}
-
-	public abstract String getTypeString(String className);
-
-	public void openInEditor() {
-		IProject project = ProjectUtilities.getProject(getJavaClass());
-		try {
-			J2EEEditorUtility.openInEditor(getJavaClass(), project);
-		} catch (Exception cantOpen) {
-			//Ignore
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:47:24 PM)
-	 * 
-	 * @param newEjb
-	 *            org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean
-	 */
-	public void setEjb(org.eclipse.jst.j2ee.ejb.EnterpriseBean newEjb) {
-		ejb = newEjb;
-	}
-
-	/**
-	 * @see IAdaptable#EcoreUtil.getAdapter(eAdapters(),Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IRESOURCE_CLASS)
-			return J2EEEditorUtility.getFile(getJavaClass());
-		if (adapter == IPROJECT_CLASS)
-			return getProject();
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java
deleted file mode 100644
index a01558641..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-
-
-/**
- * @author jsholl
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EEMessageDrivenItemProvider extends MessageDrivenItemProvider {
-
-	public J2EEMessageDrivenItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		result.addAll(super.getChildrenSuper(object));
-		J2EEJavaClassProviderHelper.addChildren((MessageDriven) object, result);
-		return result;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java
deleted file mode 100644
index b8b894876..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on May 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EEReferenceProviderHelper {
-
-	public static Collection getReferences(EnterpriseBean bean) {
-		List result = new ArrayList();
-		if (!bean.getEjbRefs().isEmpty())
-			result.addAll(bean.getEjbRefs());
-		if (!bean.getEjbLocalRefs().isEmpty())
-			result.addAll(bean.getEjbLocalRefs());
-		if (!bean.getResourceRefs().isEmpty())
-			result.addAll(bean.getResourceRefs());
-		if (!bean.getSecurityRoleRefs().isEmpty())
-			result.addAll(bean.getSecurityRoleRefs());
-		if (!bean.getResourceEnvRefs().isEmpty())
-			result.addAll(bean.getResourceEnvRefs());
-		return result;
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java
deleted file mode 100644
index d64d2751b..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:10:48 PM)
- * 
- * @author: Administrator
- */
-public class J2EESessionItemProvider extends org.eclipse.jst.j2ee.internal.ejb.provider.SessionItemProvider {
-	/**
-	 * J2EESessionItemProvider constructor comment.
-	 * 
-	 * @param adapterFactory
-	 *            org.eclipse.emf.common.notify.AdapterFactory
-	 */
-	public J2EESessionItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	public Collection getChildren(Object object) {
-		List result = new ArrayList();
-		result.addAll(super.getChildrenSuper(object));
-		addServiceEndpointInterface((Session) object, result);
-		J2EEJavaClassProviderHelper.addChildren((Session) object, result);
-		return result;
-	}
-
-	/**
-	 * @param session
-	 * @param result
-	 */
-	private void addServiceEndpointInterface(Session session, Collection children) {
-		if (session.getVersionID() >= J2EEVersionConstants.EJB_2_1_ID && session.getServiceEndpoint() != null)
-			children.add(new ServiceEndpointInterfaceProviderHelper(session));
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java
deleted file mode 100644
index cfea51ac7..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-public class LocalHomeInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-
-	private static Image image;
-
-	/**
-	 * Constructor for LocalHomeInterfaceProviderHelper.
-	 * 
-	 * @param anEJB
-	 */
-	public LocalHomeInterfaceProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	/**
-	 * @see J2EEJavaClassProviderHelper#getJavaClass()
-	 */
-	public JavaClass getJavaClass() {
-		return getEjb().getLocalHomeInterface();
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * @see J2EEJavaClassProviderHelper#getOverlayKey()
-	 */
-	protected String getOverlayKey() {
-		return "local_home_interface_overlay_obj"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see J2EEJavaClassProviderHelper#getTypeString(String)
-	 */
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("Local_Home_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Local Home Interface";
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java
deleted file mode 100644
index 9a9af2dcb..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-public class LocalInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-
-	private static Image image;
-
-	/**
-	 * Constructor for LocalInterfaceProviderHelper.
-	 * 
-	 * @param anEJB
-	 */
-	public LocalInterfaceProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * @see J2EEJavaClassProviderHelper#getJavaClass()
-	 */
-	public JavaClass getJavaClass() {
-		return getEjb().getLocalInterface();
-	}
-
-	/**
-	 * @see J2EEJavaClassProviderHelper#getOverlayKey()
-	 */
-	protected String getOverlayKey() {
-		return "local_interface_overlay_obj";//$NON-NLS-1$
-	}
-
-	/**
-	 * @see J2EEJavaClassProviderHelper#getTypeString(String)
-	 */
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("Local_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Local Interface"
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java
deleted file mode 100644
index e2109e970..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class MethodPermissionsContentProvider extends AbstractMethodsContentProvider {
-	private static final EStructuralFeature PERMISSION_MES_SF = EjbFactoryImpl.getPackage().getMethodPermission_MethodElements();
-	private static final EStructuralFeature PERMISSION_MES_UNCHECKED_SF = EjbFactoryImpl.getPackage().getMethodPermission_Unchecked();
-	private static final EStructuralFeature PERMISSION_MES_ROLES_SF = EjbFactoryImpl.getPackage().getMethodPermission_Roles();
-	private static final EStructuralFeature AD_MP_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_MethodPermissions();
-
-	/**
-	 * Constructor for MethodPermissionsContentProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param root
-	 * @param viewer
-	 */
-	public MethodPermissionsContentProvider(AdapterFactory adapterFactory, boolean root) {
-		super(adapterFactory, root);
-	}
-
-	/**
-	 * Constructor for MethodPermissionsContentProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public MethodPermissionsContentProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/*
-	 * @see ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof MethodPermission)
-			return getEnterpriseBeans((MethodPermission) parentElement);
-		return super.getChildren(parentElement);
-	}
-
-	protected Object[] getEnterpriseBeans(MethodPermission mp) {
-		List mes = mp.getMethodElements();
-		return getEnterpriseBeans(mp, mes);
-	}
-
-	/*
-	 * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
-	 */
-	protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
-		if (!(aRefObject instanceof MethodPermission))
-			return Collections.EMPTY_LIST;
-		MethodPermission parentMP = (MethodPermission) aRefObject;
-		if (parentMP == null)
-			return Collections.EMPTY_LIST;
-		return parentMP.getMethodElements(anEJB);
-	}
-
-	/*
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		super.getElements(inputElement);
-		if (inputElement instanceof EJBJar) {
-			EJBJar jar = (EJBJar) inputElement;
-			if (jar.getAssemblyDescriptor() != null)
-				return jar.getAssemblyDescriptor().getMethodPermissions().toArray();
-		}
-		if (inputElement instanceof AssemblyDescriptor)
-			return ((AssemblyDescriptor) inputElement).getMethodPermissions().toArray();
-		return new Object[0];
-	}
-
-	/*
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof MethodPermission)
-			return !((MethodPermission) element).getMethodElements().isEmpty();
-		return super.hasChildren(element);
-	}
-
-	/*
-	 * @see AbstractMethodsContentProvider#getMethodElementsReference()
-	 */
-	protected EStructuralFeature getMethodElementsReference() {
-		return PERMISSION_MES_SF;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
-	 */
-	protected EStructuralFeature getMethodElementsContainerReference() {
-		return AD_MP_SF;
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.INotifyChangedListener#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification notification) {
-		if (notification.getFeature() == PERMISSION_MES_SF || notification.getFeature() == AD_MP_SF)
-			refreshTreeViewer();
-		else if (notification.getOldValue() instanceof CMPAttribute && notification.getNewValue() == null)
-			return;
-		if (notification.getFeature() == PERMISSION_MES_UNCHECKED_SF || notification.getFeature() == PERMISSION_MES_ROLES_SF || notification.getFeature() == getMethodElementsReference() || notification.getFeature() == getMethodElementsContainerReference())
-			super.notifyChanged(notification);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java
deleted file mode 100644
index fe0e1b797..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class MethodTransactionContentProvider extends AbstractMethodsContentProvider {
-	private static final EStructuralFeature TRANSACTION_MES_SF = EjbFactoryImpl.getPackage().getMethodTransaction_MethodElements();
-	private static final EStructuralFeature AD_MT_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_MethodTransactions();
-
-	/**
-	 * Constructor for MethodTransactionContentProvider.
-	 * 
-	 * @param adapterFactory
-	 * @param root
-	 * @param viewer
-	 */
-	public MethodTransactionContentProvider(AdapterFactory adapterFactory, boolean root) {
-		super(adapterFactory, root);
-	}
-
-	/**
-	 * Constructor for MethodTransationContentProvider.
-	 * 
-	 * @param adapterFactory
-	 */
-	public MethodTransactionContentProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/*
-	 * @see ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof MethodTransaction)
-			return getEnterpriseBeans((MethodTransaction) parentElement);
-		return super.getChildren(parentElement);
-	}
-
-	protected Object[] getEnterpriseBeans(MethodTransaction mt) {
-		List mes = mt.getMethodElements();
-		return getEnterpriseBeans(mt, mes);
-	}
-
-	/*
-	 * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
-	 */
-	protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
-		if (!(aRefObject instanceof MethodTransaction))
-			return Collections.EMPTY_LIST;
-		MethodTransaction parentMT = (MethodTransaction) aRefObject;
-		if (parentMT == null)
-			return Collections.EMPTY_LIST;
-		return parentMT.getMethodElements(anEJB);
-	}
-
-	/*
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		super.getElements(inputElement);
-		if (inputElement instanceof EJBJar) {
-			EJBJar jar = (EJBJar) inputElement;
-			if (jar.getAssemblyDescriptor() != null)
-				return jar.getAssemblyDescriptor().getMethodTransactions().toArray();
-		}
-		if (inputElement instanceof AssemblyDescriptor)
-			return ((AssemblyDescriptor) inputElement).getMethodTransactions().toArray();
-		return new Object[0];
-	}
-
-	/*
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof MethodTransaction)
-			return !((MethodTransaction) element).getMethodElements().isEmpty();
-		return super.hasChildren(element);
-	}
-
-	/*
-	 * @see AbstractMethodsContentProvider#getMethodElementsReference()
-	 */
-	protected EStructuralFeature getMethodElementsReference() {
-		return TRANSACTION_MES_SF;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
-	 */
-	protected EStructuralFeature getMethodElementsContainerReference() {
-		return AD_MT_SF;
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java
deleted file mode 100644
index a2893b519..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:28:55 AM)
- * 
- * @author: Administrator
- */
-public class PrimaryKeyClassProviderHelper extends J2EEJavaClassProviderHelper {
-	private static Image image;
-
-	/**
-	 * PrimaryKeyClassProviderHelper constructor comment.
-	 * 
-	 * @param cls
-	 *            org.eclipse.jem.internal.java.JavaClass
-	 */
-	public PrimaryKeyClassProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:54:22 PM)
-	 * 
-	 * @return org.eclipse.jem.internal.java.JavaClass
-	 */
-	public JavaClass getJavaClass() {
-		return ((Entity) getEjb()).getPrimaryKey();
-	}
-
-	protected String getOverlayKey() {
-		return "key_interf_ov";//$NON-NLS-1$
-	}
-
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("Primary_Key_Class_UI_", new Object[]{className}); //$NON-NLS-1$ = "Primary Key Class"
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java
deleted file mode 100644
index 3fcb79009..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:28:12 AM)
- * 
- * @author: Administrator
- */
-public class RemoteInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-	private static Image image;
-
-	/**
-	 * RemoteInterfaceProviderHelper constructor comment.
-	 * 
-	 * @param cls
-	 *            org.eclipse.jem.internal.java.JavaClass
-	 */
-	public RemoteInterfaceProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:55:48 PM)
-	 * 
-	 * @return org.eclipse.jem.internal.java.JavaClass
-	 */
-	public JavaClass getJavaClass() {
-		return getEjb().getRemoteInterface();
-	}
-
-	protected String getOverlayKey() {
-		return "remote_interface_overlay_obj";//$NON-NLS-1$
-	}
-
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("Remote_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Remote Interface"
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java
deleted file mode 100644
index 5ad2b0c2e..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author dfholttp
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServiceEndpointInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-	private static Image image;
-
-	/**
-	 * @param anEJB
-	 */
-	public ServiceEndpointInterfaceProviderHelper(EnterpriseBean anEJB) {
-		super(anEJB);
-	}
-
-	public Image getImage() {
-		if (image == null)
-			image = createImage();
-		return image;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 1:53:49 PM)
-	 * 
-	 * @return org.eclipse.jem.internal.java.JavaClass
-	 */
-	public JavaClass getJavaClass() {
-		return ((Session) getEjb()).getServiceEndpoint();
-	}
-
-	protected String getOverlayKey() {
-		//TODO: DFH we need an icon
-		return "";//$NON-NLS-1$
-	}
-
-	public String getTypeString(String className) {
-		return J2EEUIMessages.getResourceString("Service_Endpoint_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Home Interface"
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java
deleted file mode 100644
index 0544eb584..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.internal.listeners;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.events.ShellListener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-
-public interface IValidateEditListener extends ResourceStateValidatorPresenter, IPartListener, ShellListener {
-	/**
-	 * This method should be called by any action that is about to edit any contents of any IFile.
-	 */
-	public IStatus validateState();
-
-	/**
-	 * Return true if there are any read only IFiles that are being managed.
-	 * 
-	 * @return boolean
-	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getResources()
-	 */
-	boolean hasReadOnlyFiles();
-
-	/**
-	 * This method should be called prior to saving the contents. It returns true if the contents
-	 * can be saved.
-	 */
-	boolean checkSave() throws CoreException;
-
-	/**
-	 * Use this method to set the Shell that will be used to prompt to the user.
-	 */
-	void setShell(Shell aShell);
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
deleted file mode 100644
index d8c8a9636..000000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
+++ /dev/null
@@ -1,330 +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.j2ee.internal.listeners;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.ListMessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-
-public class ValidateEditListener extends ShellAdapter implements IValidateEditListener, IValidateEditContext {
-	
-	protected ResourceStateValidator fValidator;
-	private boolean fNeedsStateValidation = true;
-	private Shell fShell;
-	private IWorkbenchPart fPart;
-	private boolean fHasReadOnlyFiles = false;
-	private boolean firstReadOnlyFileAttempt = true;
-	private boolean fMessageUp = false;
-	private boolean fIsActivating = false;
-	private boolean fIsDeactivating = false;
-	private boolean inconsistentResult;
-	private boolean inconsistentOverwriteResult;
-	
-	public ValidateEditListener() {
-		super();
-		try {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					IWorkbench wb = PlatformUI.getWorkbench();
-					if (wb == null) return;
-					IWorkbenchWindow window = wb.getActiveWorkbenchWindow();
-					if (window == null && wb.getWorkbenchWindowCount()>0) {
-						for (int i=0; i<wb.getWorkbenchWindows().length; i++) {
-							window = wb.getWorkbenchWindows()[i];
-							if (window != null)
-								break;
-						}
-						
-					}
-					if (window!=null)
-						setShell(window.getShell());
-				}
-			});
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * Constructor for ValidateEditHandler.
-	 */
-	public ValidateEditListener(IWorkbenchPart part, ResourceStateValidator aValidator) {
-		super();
-		fPart = part;
-		fValidator = aValidator;
-		if (part != null)
-			part.getSite().getPage().addPartListener(this);
-		if (getShell() != null)
-			getShell().addShellListener(this);
-	}
-
-	protected Shell getShell() {
-		if (fShell == null) {
-			if (fPart != null && fPart.getSite() != null)
-				fShell = fPart.getSite().getShell();
-		}
-		return fShell;
-	}
-
-	/**
-	 * @see IValidateEditListener#getValidator()
-	 */
-	public ResourceStateValidator getValidator() {
-		return fValidator;
-	}
-
-	/**
-	 * @see IValidateEditListener#getNeedsStateValidation()
-	 */
-	public boolean getNeedsStateValidation() {
-		return fNeedsStateValidation;
-	}
-
-	/**
-	 * @see IValidateEditListener#setNeedsStateValidation(boolean)
-	 */
-	public void setNeedsStateValidation(boolean needsStateValidation) {
-		fNeedsStateValidation = needsStateValidation;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#promptForInconsistentFileRefresh(List)
-	 */
-	public boolean promptForInconsistentFileRefresh(List inconsistentFiles) {
-		if (inconsistentFiles == null || inconsistentFiles.size() == 0) // this case should never
-			// occur.
-			return false;
-
-		List inconsistentFileNames = new ArrayList();
-		for (int i = 0; inconsistentFiles.size() > i; i++) {
-			Object file = inconsistentFiles.get(i);
-			if (file instanceof Resource) {
-				IFile aFile = WorkbenchResourceHelper.getFile((Resource) file);
-				inconsistentFileNames.add(aFile.getFullPath().toOSString());
-			} else if (file instanceof IResource) {
-				IResource resfile = (IResource) file;
-				if (!resfile.exists()) {
-					return false;
-				}
-				inconsistentFileNames.add(resfile.getFullPath().toOSString());
-			}
-		}
-
-		final String title = J2EEUIMessages.getResourceString("Inconsistent_Files_3"); //$NON-NLS-1$
-		final String message = J2EEUIMessages.getResourceString("The_following_workspace_files_are_inconsistent_with_the_editor_4") + J2EEUIMessages.getResourceString("Update_the_editor_with_the_workspace_contents__5"); //$NON-NLS-1$ //$NON-NLS-2$
-		final String[] fileNames = (String[])inconsistentFileNames.toArray(new String[inconsistentFileNames.size()]);
-		
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				inconsistentResult = ListMessageDialog.openQuestion(getShell(), title, message, fileNames);
-			}
-		});
-		return inconsistentResult;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#getValidateEditContext()
-	 */
-	public Object getValidateEditContext() {
-		return getShell();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		if (part == fPart) {
-			handleActivation();
-		}
-	}
-
-	protected void handleActivation() {
-		if (fIsActivating)
-			return;
-		fIsActivating = true;
-		try {
-			fValidator.checkActivation(this);
-			updatePartReadOnly();
-		} catch (CoreException e) {
-			// do nothing for now
-		} finally {
-			fIsActivating = false;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.ShellListener#shellActivated(ShellEvent)
-	 */
-	public void shellActivated(ShellEvent event) {
-		handleActivation();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-		//do nothing
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part == fPart)
-			part.getSite().getPage().removePartListener(this);
-		if (getShell() != null)
-			getShell().removeShellListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-		if (part == fPart) {
-			if (fIsDeactivating)
-				return;
-			fIsDeactivating = true;
-			try {
-				fValidator.lostActivation(this);
-				updatePartReadOnly();
-			} catch (CoreException e) {
-				// do nothing for now
-			} finally {
-				fIsDeactivating = true;
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-		//do nothing
-	}
-
-	public IStatus validateState() {
-		IWorkbench wb = PlatformUI.getWorkbench();
-		if ((fShell==null) && (wb != null && (wb.getActiveWorkbenchWindow() != null)))
-			fShell=wb.getActiveWorkbenchWindow().getShell();
-		if (fNeedsStateValidation) {
-			setNeedsStateValidation(false);
-			try {
-				final IStatus status = fValidator.validateState(this);
-				if (status.getSeverity() == IStatus.ERROR) {
-					setNeedsStateValidation(true);
-					if (!fMessageUp) {
-						fMessageUp = true;
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								MessageDialog.openError(getShell(), J2EEUIMessages.getResourceString("Error_checking_out_files_10"), status.getMessage()); //$NON-NLS-1$
-							}
-						});
-						fMessageUp = false;
-					}
-				}
-				fValidator.checkActivation(this);
-				updatePartReadOnly();
-				return status;
-			} catch (CoreException e) {
-				// do nothing for now
-			}
-		}
-		return ResourceStateValidator.OK_STATUS;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#promptForInconsistentFileOverwrite(List)
-	 */
-	public boolean promptForInconsistentFileOverwrite(List inconsistentFiles) {
-		int size = inconsistentFiles.size();
-		List files = new ArrayList();
-		IFile file = null;
-		for (int i = 0; i < size; i++) {
-			file = (IFile) inconsistentFiles.get(i);
-			files.add(file.getFullPath().toString());
-		}
-		final String[] items = (String[])files.toArray(new String[files.size()]);
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				inconsistentOverwriteResult = ListMessageDialog.openQuestion(getShell(), J2EEUIMessages.getResourceString("Inconsistent_files_detected_11"), //$NON-NLS-1$
-					J2EEUIMessages.getResourceString("The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_"), //$NON-NLS-1$
-					items);
-			}
-		});
-		return inconsistentOverwriteResult;
-	}
-
-	protected boolean checkReadOnly() {
-		fHasReadOnlyFiles = fValidator.checkReadOnly();
-		return fHasReadOnlyFiles;
-	}
-
-	/**
-	 * @see IValidateEditListener#hasReadOnlyFiles()
-	 */
-	public boolean hasReadOnlyFiles() {
-		if (firstReadOnlyFileAttempt) {
-			checkReadOnly();
-			firstReadOnlyFileAttempt = false;
-		}
-		return fHasReadOnlyFiles;
-	}
-
-	/**
-	 * Method updatePartReadOnly.
-	 */
-	protected void updatePartReadOnly() {
-		if (!getNeedsStateValidation()) {
-			checkReadOnly();
-			setNeedsStateValidation(true);
-		} else { //So that J2EEXMLActionBarContributor get updated info when editor Activated.
-			firstReadOnlyFileAttempt = true;
-		}
-	}
-
-	public boolean checkSave() throws CoreException {
-		return validateState().isOK() && getValidator().checkSave(this);
-	}
-
-	public void setShell(Shell aShell) {
-		fShell = aShell;
-	}
-	
-	public void setEditModel(EditModel anEditModel) {
-		fValidator = anEditModel;
-		
-	}
-
-	public IStatus validateState(EditModel anEditModel) {
-		setEditModel(anEditModel);
-		return validateState();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
deleted file mode 100644